Re: [Mesa-dev] [PATCH] st/mesa: rewrite the primitive restart fallback code

2011-11-18 Thread Jose Fonseca
- Original Message - Previously we were mapping/unmapping the index buffer each time we found the restart index in the buffer. This is bad when the restart index is frequently used. Now just map the index buffer once, scan it to produce a list of sub-primitives, unmap the buffer,

[Mesa-dev] [Bug 43068] New: MESA fails to draw gnome-shell properly | Half of letters are not drawn.

2011-11-18 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=43068 Bug #: 43068 Summary: MESA fails to draw gnome-shell properly | Half of letters are not drawn. Classification: Unclassified Product: Mesa Version: 7.11 Platform:

Re: [Mesa-dev] [PATCH 2/2] swrast: fix unmatched span-array-ChanType

2011-11-18 Thread Brian Paul
On 11/18/2011 12:38 AM, Yuanhan Liu wrote: texture_combine converts the result rgba to CHAN_TYPE from FLOAT. At the same time, make sure the span-array-ChanType is changed, too. Signed-off-by: Yuanhan Liuyuanhan@linux.intel.com --- src/mesa/swrast/s_texcombine.c |5 + 1 files

Re: [Mesa-dev] [PATCH 1/2] swrast: simplify the prototype of function texture_combine

2011-11-18 Thread Brian Paul
On 11/18/2011 12:38 AM, Yuanhan Liu wrote: Parameter n and rgbaChan are both from structure span, thus using span as paramter to simplify the prototype. Function texture_combine is only used by _swrast_texture_span, so I guess it's safe to do so. This patch is mainly for the next patch.

Re: [Mesa-dev] [PATCH 0/2] Patches to try to fix draw-pixel-with-textures in swrast

2011-11-18 Thread Brian Paul
On 11/18/2011 12:38 AM, Yuanhan Liu wrote: The two patches tries to fix an issue that happened while calling glDrawPixels with texture enabled. Here I attached a piglit testcase for this issue. Can you resend? I can't detach the attachment and when I save the msg to a text file it's all on

Re: [Mesa-dev] [PATCH 2/2] swrast: fix unmatched span-array-ChanType

2011-11-18 Thread Ian Romanick
On 11/18/2011 08:49 AM, Brian Paul wrote: On 11/18/2011 12:38 AM, Yuanhan Liu wrote: texture_combine converts the result rgba to CHAN_TYPE from FLOAT. At the same time, make sure the span-array-ChanType is changed, too. Signed-off-by: Yuanhan Liuyuanhan@linux.intel.com ---

Re: [Mesa-dev] [PATCH 0/2] Patches to try to fix draw-pixel-with-textures in swrast

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 15:38:46 +0800, Yuanhan Liu yuanhan@linux.intel.com wrote: The two patches tries to fix an issue that happened while calling glDrawPixels with texture enabled. Here I attached a piglit testcase for this issue. git send-email does reasonable things if you supply

[Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Marek Olšák
--- src/glsl/ast_to_hir.cpp |7 +-- src/glsl/glsl_lexer.ll |1 + src/glsl/glsl_parser.yy |9 - src/glsl/ir_clone.cpp |1 + 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index ac090c3..51fec19 100644

[Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Marek Olšák
--- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |3 ++ src/mesa/program/ir_to_mesa.cpp| 29 -- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 23 -- 4 files changed, 54

[Mesa-dev] [PATCH 3/6] gallium: implement ARB_conservative_depth

2011-11-18 Thread Marek Olšák
This adds a new TGSI property to represent the GLSL layout qualifier in TGSI. --- src/gallium/auxiliary/tgsi/tgsi_dump.c |1 + src/gallium/auxiliary/tgsi/tgsi_ureg.c | 16 src/gallium/auxiliary/tgsi/tgsi_ureg.h |5 +

[Mesa-dev] [PATCH 4/6] gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

2011-11-18 Thread Marek Olšák
Only i965g does not enable GLSL, but that driver has been unmaintained and bitrotting for quite a while anyway. --- src/gallium/auxiliary/util/u_caps.c|1 - src/gallium/docs/source/screen.rst |1 - src/gallium/drivers/cell/ppu/cell_screen.c |2 -

[Mesa-dev] [PATCH 5/6] gallium: expose GLSL 1.3 if PIPE_CAP_SM4 is exposed (new cap)

2011-11-18 Thread Marek Olšák
--- src/gallium/include/pipe/p_defines.h |3 ++- src/mesa/state_tracker/st_extensions.c |5 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 3e55d22..e51132a 100644 ---

[Mesa-dev] [PATCH 6/6] st/mesa: enable ARB(AMD)_convervative_depth if GLSL 1.3 is supported

2011-11-18 Thread Marek Olšák
The spec says GL3 is required, but technically the extension only needs the 'out' modifier from GLSL 1.3. --- src/mesa/state_tracker/st_extensions.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c

[Mesa-dev] ir_swizzle @ 0xe134ae0 specifies a channel not present in the value

2011-11-18 Thread Theiss, Ingo
Hi there, while trying to play the game Ryzom with latest mesa compiled from git the program terminates with error ir_swizzle @ 0xe134ae0 specifies a channel not present in the value. Switching back to the stable branch mesa-7.11 (haven´t tried mesa-7.11.1) the error is gone. My glxinfo:

Re: [Mesa-dev] [PATCH 5/6] gallium: expose GLSL 1.3 if PIPE_CAP_SM4 is exposed (new cap)

2011-11-18 Thread Marek Olšák
Please disregard this patch and the last one too. GLSL 1.3 in st/mesa is not as complete and usable as I thought. Marek On Fri, Nov 18, 2011 at 8:27 PM, Marek Olšák mar...@gmail.com wrote: ---  src/gallium/include/pipe/p_defines.h   |    3 ++-  src/mesa/state_tracker/st_extensions.c |    5

Re: [Mesa-dev] [PATCH 08/41] intel: Replace intel_renderbuffer::region with a miptree

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:35 -0800, Chad Versace chad.vers...@linux.intel.com wrote: Essentially, this patch just globally substitutes `irb-region` with `irb-mt-region` and then does some minor cleanups to avoid segfaults and other problems. This is in preparation for 1. Fixing

[Mesa-dev] [PATCH] mesa : move bindbuffer{base, range} from transformfeedback.c

2011-11-18 Thread vlj
BindBuffer* functions are part of tfb extension. They are however used by others extensions such as uniform buffer object. This patch moves the BindBuffer* definition to to bufferobj.c where it acts as a dispatcher calling original tfb function ; BindBuffer* functions can be used by

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:38 -0800, Chad Versace chad.vers...@linux.intel.com wrote: For all texture targets except GL_TEXTURE_CUBE_MAP, the 'nr_images' and 'depth' fields of intel_mipmap_level were identical. In the exceptional case, nr_images == 6 and depth == 1. It is simple to

Re: [Mesa-dev] [PATCH 15/41] intel: Refactor intel_render_texture()

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:42 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is in preparation for properly implementing glFramebufferTexture*() for mipmapped depthstencil textures. The FIXME comments deleted by this patch give a rough explanation of what was broken. This

Re: [Mesa-dev] [PATCH] mesa : move bindbuffer{base, range} from transformfeedback.c

2011-11-18 Thread Brian Paul
On 11/18/2011 01:11 PM, vlj wrote: BindBuffer* functions are part of tfb extension. They are however used by others extensions such as uniform buffer object. This patch moves the BindBuffer* definition to to bufferobj.c where it acts as a dispatcher calling original tfb function

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Ian Romanick
On 11/18/2011 11:27 AM, Marek Olšák wrote: This patch also needs to change the _mesa_glsl_supported_extensions table in glsl_parser_extras.cpp. AMD_conservative_depth is used for both versions of the extension in the table. I'm not super convinced that we even need separate enable flags.

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Ian Romanick
On 11/18/2011 11:27 AM, Marek Olšák wrote: --- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |3 ++ src/mesa/program/ir_to_mesa.cpp| 29 --

Re: [Mesa-dev] [PATCH 08/41] intel: Replace intel_renderbuffer::region with a miptree

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 12:04 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:35 -0800, Chad Versace chad.vers...@linux.intel.com wrote: Essentially, this patch just globally substitutes `irb-region` with `irb-mt-region` and then does some minor cleanups

[Mesa-dev] [PATCH] intel: Replace intel_renderbuffer::region with a miptree [v2]

2011-11-18 Thread Chad Versace
Essentially, this patch just globally substitutes `irb-region` with `irb-mt-region` and then does some minor cleanups to avoid segfaults and other problems. This is in preparation for 1. Fixing scatter/gather for mipmapped separate stencil textures. 2. Supporting HiZ for mipmapped depth

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 12:44 PM, Ian Romanick wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: --- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |3 ++ src/mesa/program/ir_to_mesa.cpp| 29

[Mesa-dev] [PATCH] intel: Replace intel_mipmap_tree::hiz_region with a miptree [v2]

2011-11-18 Thread Chad Versace
This is required to correctly implement HiZ for mipmapped and multi-layered textures. v2: Accomodate refcount fixes in intel_process_dri2_buffer_*() that were introduced in v2 of commit intel: Replace intel_renderbuffer::region with a miptree [v2] CC: Eric Anholt eric@anholt

Re: [Mesa-dev] [PATCH 4/6] gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 11:27 AM, Marek Olšák wrote: Only i965g does not enable GLSL, but that driver has been unmaintained and bitrotting for quite a while anyway. It doesn't even do GLSL? I'm pretty shocked, I figured it at least did that. Is it even worth keeping around in the tree? Seems like it's

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 11:27 AM, Marek Olšák wrote: diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index e8ac9fb..c63615c 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -51,6 +51,7 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Marek Olšák
On Fri, Nov 18, 2011 at 10:14 PM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index e8ac9fb..c63615c 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -51,6 +51,7 @@

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Marek Olšák
On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanick i...@freedesktop.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: ---  src/glsl/linker.cpp                        |   45  src/mesa/main/mtypes.h                     |    3 ++  src/mesa/program/ir_to_mesa.cpp    

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 12:22 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:38 -0800, Chad Versace chad.vers...@linux.intel.com wrote: - For GL_TEXTURE_3D, it is the texture's depth at each miplevel. It's value, like width and height, varies

[Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images [v2]

2011-11-18 Thread a
From: Chad Versace chad.vers...@linux.intel.com For all texture targets except GL_TEXTURE_CUBE_MAP, the 'nr_images' and 'depth' fields of intel_mipmap_level were identical. In the exceptional case, nr_images == 6 and depth == 1. It is simple to determine if a texture is a cube or not, so the

Re: [Mesa-dev] ir_swizzle @ 0xe134ae0 specifies a channel not present in the value

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 11:48 AM, Theiss, Ingo wrote: Hi there, while trying to play the game Ryzom with latest mesa compiled from git the program terminates with error ir_swizzle @ 0xe134ae0 specifies a channel not present in the value. Switching

Re: [Mesa-dev] [PATCH] Allow glTexImage2D with a depth component cube map

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/16/2011 07:56 PM, Anuj Phogat wrote: From: Anuj Phogat anuj.pho...@gmail.com Hi, Here is a patch to allow glTexImage2D and glCopyTexImage2D with depth component cubemap. It is listed in mesa work queue with a label CUBE1. I've tested

Re: [Mesa-dev] [PATCH 1/6] glsl: finish up ARB_conservative_depth

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 01:23 PM, Marek Olšák wrote: On Fri, Nov 18, 2011 at 10:14 PM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index e8ac9fb..c63615c 100644 --- a/src/glsl/ir_clone.cpp +++

Re: [Mesa-dev] [PATCH 4/6] gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

2011-11-18 Thread Keith Whitwell
- Original Message - On 11/18/2011 11:27 AM, Marek Olšák wrote: Only i965g does not enable GLSL, but that driver has been unmaintained and bitrotting for quite a while anyway. It doesn't even do GLSL? I'm pretty shocked, I figured it at least did that. Is it even worth

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Ian Romanick
On 11/18/2011 01:33 PM, Marek Olšák wrote: On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanicki...@freedesktop.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: --- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |

Re: [Mesa-dev] [PATCH 2/6] mesa: set the gl_FragDepth layout in the GLSL linker

2011-11-18 Thread Ian Romanick
On 11/18/2011 01:33 PM, Marek Olšák wrote: On Fri, Nov 18, 2011 at 9:44 PM, Ian Romanicki...@freedesktop.org wrote: On 11/18/2011 11:27 AM, Marek Olšák wrote: --- src/glsl/linker.cpp| 45 src/mesa/main/mtypes.h |

Re: [Mesa-dev] [PATCH 15/41] intel: Refactor intel_render_texture()

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:42 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is in preparation for properly implementing glFramebufferTexture*() for mipmapped depthstencil textures. The FIXME comments deleted by this patch give a rough explanation of what was broken. This

Re: [Mesa-dev] [PATCH] Allow glTexImage2D with a depth component cube map

2011-11-18 Thread Ian Romanick
On 11/16/2011 07:56 PM, Anuj Phogat wrote: From: Anuj Phogatanuj.pho...@gmail.com Hi, Here is a patch to allow glTexImage2D and glCopyTexImage2D with depth component cubemap. It is listed in mesa work queue with a label CUBE1. I've tested the patch and output looks visually correct. Please

Re: [Mesa-dev] [PATCH 16/41] intel: Replace intel_texture_image::stencil_irb with intel_mipmap_tree::stencil_mt

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:43 -0800, Chad Versace chad.vers...@linux.intel.com wrote: For depthstencil textures using separate stencil, we embedded a stencil buffer in intel_texture_image. The intention was that the embedded stencil buffer would be the golden copy of the texture's stencil bits.

Re: [Mesa-dev] [PATCH 16/41] intel: Replace intel_texture_image::stencil_irb with intel_mipmap_tree::stencil_mt

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 03:19 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:43 -0800, Chad Versace chad.vers...@linux.intel.com wrote: For depthstencil textures using separate stencil, we embedded a stencil buffer in intel_texture_image. The intention

Re: [Mesa-dev] [PATCH 17/41] intel: Replace intel_mipmap_tree::hiz_region with a miptree

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:44 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is required to correctly implement HiZ for mipmapped and multi-layered textures. Signed-off-by: Chad Versace chad.vers...@linux.intel.com --- src/mesa/drivers/dri/i965/brw_misc_state.c |5

Re: [Mesa-dev] [PATCH 20/41] intel: Define struct intel_resolve_map

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:47 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is a map of miptree slices to needed resolves, implemented as a linked list. A future commit will embed such a list in intel_mipmap_tree. If you think I'm crazy to put a list in a miptree, read the

Re: [Mesa-dev] [PATCH 17/41] intel: Replace intel_mipmap_tree::hiz_region with a miptree

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 03:24 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:44 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is required to correctly implement HiZ for mipmapped and multi-layered textures. Signed-off-by: Chad Versace

Re: [Mesa-dev] [PATCH 10/41] intel: Refactor intel_miptree_copy_teximage()

2011-11-18 Thread Kenneth Graunke
On 11/17/2011 07:58 PM, Chad Versace wrote: Extract the body of the inner loop into a new function, intel_miptree_copy_slice(). This is in preparation for adding support for separate stencil and HiZ to intel_miptree_copy_teximage(). When copying a slice of a depthstencil miptree that uses

Re: [Mesa-dev] [PATCH 20/41] intel: Define struct intel_resolve_map

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 03:27 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:47 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is a map of miptree slices to needed resolves, implemented as a linked list. A future commit will embed such a

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images [v2]

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 01:52 PM, Chad Versace wrote: [snip] @@ -335,23 +338,18 @@ intel_miptree_get_image_offset(struct intel_mipmap_tree *mt, GLuint level, GLuint face, GLuint depth, GLuint *x, GLuint *y) { - switch (mt-target) { -

Re: [Mesa-dev] [PATCH 26/41] i965/gen6: Manipulate state batches for HiZ meta-ops

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:53 -0800, Chad Versace chad.vers...@linux.intel.com wrote: A lot of the state manipulation is handled by the meta-op state setup. However, some batches need manual intervention. Signed-off-by: Chad Versace chad.vers...@linux.intel.com ---

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 13:36:25 -0800, Chad Versace chad.vers...@linux.intel.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 12:22 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:38 -0800, Chad Versace chad.vers...@linux.intel.com wrote: - For GL_TEXTURE_3D, it

Re: [Mesa-dev] [PATCH 12/41] intel: Track the miptree layer wrapped by a renderbuffer

2011-11-18 Thread Kenneth Graunke
On 11/17/2011 07:58 PM, Chad Versace wrote: Add two fields to intel_renderbuffer: mt_level mt_layer Multiple renderbuffers may simultaneously wrap a single texture and each provide a different view into that texture. [Consider glFramebufferTextureLayer()]. The new fields indicate

Re: [Mesa-dev] [PATCH 10/41] intel: Refactor intel_miptree_copy_teximage()

2011-11-18 Thread Chad Versace
On 11/18/2011 03:42 PM, Kenneth Graunke wrote: On 11/17/2011 07:58 PM, Chad Versace wrote: Extract the body of the inner loop into a new function, intel_miptree_copy_slice(). This is in preparation for adding support for separate stencil and HiZ to intel_miptree_copy_teximage(). When copying

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images [v2]

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 13:52:32 -0800, a...@anholt.net wrote: From: Chad Versace chad.vers...@linux.intel.com For all texture targets except GL_TEXTURE_CUBE_MAP, the 'nr_images' and 'depth' fields of intel_mipmap_level were identical. In the exceptional case, nr_images == 6 and depth == 1.

Re: [Mesa-dev] [PATCH 10/41] intel: Refactor intel_miptree_copy_teximage()

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 04:04 PM, Chad Versace wrote: On 11/18/2011 03:42 PM, Kenneth Graunke wrote: On 11/17/2011 07:58 PM, Chad Versace wrote: Extract the body of the inner loop into a new function, intel_miptree_copy_slice(). This is in preparation for adding support for separate stencil and HiZ to

Re: [Mesa-dev] [PATCH 11/41] intel: Kill intel_mipmap_level::nr_images [v2]

2011-11-18 Thread Chad Versace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 03:55 PM, Kenneth Graunke wrote: On 11/18/2011 01:52 PM, Chad Versace wrote: [snip] @@ -335,23 +338,18 @@ intel_miptree_get_image_offset(struct intel_mipmap_tree *mt, GLuint level, GLuint face, GLuint

[Mesa-dev] [PATCH] intel: Kill intel_mipmap_level::nr_images [v3]

2011-11-18 Thread Chad Versace
For all texture targets except GL_TEXTURE_CUBE_MAP, the 'nr_images' and 'depth' fields of intel_mipmap_level were identical. In the exceptional case, nr_images == 6 and depth == 1. It is simple to determine if a texture is a cube or not, so the presence of two fields here was not helpful. Worse,

Re: [Mesa-dev] [PATCH 17/41] intel: Replace intel_mipmap_tree::hiz_region with a miptree

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 15:41:04 -0800, Chad Versace chad.vers...@linux.intel.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/18/2011 03:24 PM, Eric Anholt wrote: On Thu, 17 Nov 2011 19:58:44 -0800, Chad Versace chad.vers...@linux.intel.com wrote: +bool

[Mesa-dev] [PATCH 1/3] mesa: define, use _mesa_is_cube_face() in several places

2011-11-18 Thread Brian Paul
--- src/mesa/main/fbobject.c| 10 +- src/mesa/main/texgetimage.c |9 - src/mesa/main/teximage.c|9 +++-- src/mesa/main/teximage.h| 10 ++ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/mesa/main/fbobject.c

[Mesa-dev] [PATCH 2/3] mesa: make slow_read_rgba_pixels() a void function

2011-11-18 Thread Brian Paul
The boolean return value was ignored by the caller. --- src/mesa/main/readpix.c |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 86b8753..aa893de 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c

Re: [Mesa-dev] [PATCH] intel: Replace intel_mipmap_tree::hiz_region with a miptree [v2]

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 12:58:43 -0800, Chad Versace chad.vers...@linux.intel.com wrote: This is required to correctly implement HiZ for mipmapped and multi-layered textures. v2: Accomodate refcount fixes in intel_process_dri2_buffer_*() that were introduced in v2 of commit intel:

[Mesa-dev] [PATCH 3/3] mesa: handle MapRenderbuffer() failures in glReadPixels

2011-11-18 Thread Brian Paul
--- src/mesa/main/readpix.c | 45 + 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index aa893de..8048a72 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -70,6

Re: [Mesa-dev] [PATCH] intel: Kill intel_mipmap_level::nr_images [v3]

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 04:19 PM, Chad Versace wrote: For all texture targets except GL_TEXTURE_CUBE_MAP, the 'nr_images' and 'depth' fields of intel_mipmap_level were identical. In the exceptional case, nr_images == 6 and depth == 1. It is simple to determine if a texture is a cube or not, so the

[Mesa-dev] [PATCH] intel: Track the miptree layer wrapped by a renderbuffer [v2]

2011-11-18 Thread Chad Versace
Add two fields to intel_renderbuffer: mt_level mt_layer Multiple renderbuffers may simultaneously wrap a single texture and each provide a different view into that texture. [Consider glFramebufferTextureLayer()]. The new fields indicate which slice of the miptree is wrapped by the

Re: [Mesa-dev] [PATCH] intel: Track the miptree layer wrapped by a renderbuffer [v2]

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 04:51 PM, Chad Versace wrote: Add two fields to intel_renderbuffer: mt_level mt_layer Multiple renderbuffers may simultaneously wrap a single texture and each provide a different view into that texture. [Consider glFramebufferTextureLayer()]. The new fields indicate

Re: [Mesa-dev] [PATCH 1/3] mesa: define, use _mesa_is_cube_face() in several places

2011-11-18 Thread Kenneth Graunke
On 11/18/2011 04:39 PM, Brian Paul wrote: --- src/mesa/main/fbobject.c| 10 +- src/mesa/main/texgetimage.c |9 - src/mesa/main/teximage.c|9 +++-- src/mesa/main/teximage.h| 10 ++ 4 files changed, 18 insertions(+), 20 deletions(-) For the

Re: [Mesa-dev] [PATCH] intel: Replace intel_renderbuffer::region with a miptree [v2]

2011-11-18 Thread Eric Anholt
On Fri, 18 Nov 2011 12:50:36 -0800, Chad Versace chad.vers...@linux.intel.com wrote: Essentially, this patch just globally substitutes `irb-region` with `irb-mt-region` and then does some minor cleanups to avoid segfaults and other problems. This is in preparation for 1. Fixing

Re: [Mesa-dev] [PATCH 27/41] i965: Prevent recursive calls to FLUSH_VERTICES

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:54 -0800, Chad Versace chad.vers...@linux.intel.com wrote: To do so, we must resolve all buffers on entering a glBegin/glEnd block. For the detailed explanation, see the Doxygen comments in this patch. Signed-off-by: Chad Versace chad.vers...@linux.intel.com ---

Re: [Mesa-dev] [PATCH 32/41] intel: Mark needed resolves when first enabling HiZ on a miptree

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:59 -0800, Chad Versace chad.vers...@linux.intel.com wrote: Signed-off-by: Chad Versace chad.vers...@linux.intel.com --- src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 21 - 1 files changed, 20 insertions(+), 1 deletions(-) diff --git

Re: [Mesa-dev] [PATCH 35/41] intel: Enable HiZ for texture renderbuffers

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:59:02 -0800, Chad Versace chad.vers...@linux.intel.com wrote: When a depth texture is first attached to framebuffer, allocate a HiZ miptree for it. Signed-off-by: Chad Versace chad.vers...@linux.intel.com --- src/mesa/drivers/dri/intel/intel_fbo.c |7 +++ 1

Re: [Mesa-dev] [PATCH 26/41] i965/gen6: Manipulate state batches for HiZ meta-ops

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:58:53 -0800, Chad Versace chad.vers...@linux.intel.com wrote: A lot of the state manipulation is handled by the meta-op state setup. However, some batches need manual intervention. Signed-off-by: Chad Versace chad.vers...@linux.intel.com ---

Re: [Mesa-dev] [PATCH 37/41] i965: Set vertical alignment in SURFACE_STATE batch

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:59:04 -0800, Chad Versace chad.vers...@linux.intel.com wrote: Signed-off-by: Chad Versace chad.vers...@linux.intel.com --- src/mesa/drivers/dri/i965/brw_defines.h |9 + src/mesa/drivers/dri/i965/brw_wm_surface_state.c |8 ++-- 2 files

[Mesa-dev] [PATCH 2/2] mesa: Make formats.c datatype values match glGetTexLevelParameter return.

2011-11-18 Thread Eric Anholt
The formats.c code's datatype value is what does this value mean, i.e. unorm or snorm or float, and is the return value from the GL_TEXTURE_RED_TYPE class of queries. The depth formats were marked as GL_UNSIGNED_INT, which is what we use for integer, and not what we should be returning from the

Re: [Mesa-dev] [PATCH 41/41] i965: Document where Piglit test glean/fbo breaks due to HiZ

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:59:08 -0800, Chad Versace chad.vers...@linux.intel.com wrote: I found the line of code that breaks the test, but don't know how to easily fix it. Signed-off-by: Chad Versace chad.vers...@linux.intel.com --- src/mesa/drivers/dri/i965/brw_context.c |3 +++ 1

[Mesa-dev] [PATCH 1/2] mesa: Don't report types for 0-sized components of textures.

2011-11-18 Thread Eric Anholt
The GL_TEXTURE_WHATEVER_SIZE entrypoints were checking if the specified base type of the texture allowed that channel to be present before reporting the size of the channel, so that GL_RGB didn't end up with an alpha size if the hardware driver had to store it that way. The

Re: [Mesa-dev] [PATCH 38/41] i965: Implement the actual tables for texture alignment units.

2011-11-18 Thread Eric Anholt
On Thu, 17 Nov 2011 19:59:05 -0800, Chad Versace chad.vers...@linux.intel.com wrote: From: Kenneth Graunke kenn...@whitecape.org I implemented functions for horizontal/vertical alignment units separately because I find it easier to read that way...especially with all the corner-cases.

Re: [Mesa-dev] Problem building current git with osmesa and no gallium

2011-11-18 Thread Chia-I Wu
On Tue, Nov 15, 2011 at 9:08 PM, Matthew Cattell mcatt...@spamarrest.com wrote: Brian Paul brianp at vmware.com writes: On 03/10/2011 08:30 PM, tom fogal wrote: Kenneth Graunkekenneth at whitecape.org  writes: On Thursday, March 10, 2011 01:17:04 PM Alexander Neundorf wrote: While at it