Re: [Mesa-dev] [PATCH 3/5] i965/fs: Add support for textureGather(.., comp)

2013-10-05 Thread Chris Forbes
I'm not sure about the compile-time error, or how to hack it in -- at ast_to_hir time, function calls haven't been inlined yet, so I think this gets really nasty? Will address it in a follow-up patch though as you suggest. -- Chris On Sun, Oct 6, 2013 at 7:06 AM, Kenneth Graunke wrote: > On 10/

Re: [Mesa-dev] [PATCH 12/19] glsl: Generalize processing of variable redeclarations.

2013-10-05 Thread Kenneth Graunke
On 10/02/2013 05:45 PM, Paul Berry wrote: > This patch modifies the get_variable_being_redeclared() function so > that it no longer relies on the ast_declaration for the variable being > redeclared. In future patches, this will allow > get_variable_being_redeclared() to be used for processing > re

Re: [Mesa-dev] [PATCH 1/5] glsl: Add support for specifying the component in textureGather

2013-10-05 Thread Chris Forbes
Yes, that's clearer; what I had was a strange artifact of how it grew :) -- Chris On Sun, Oct 6, 2013 at 6:54 AM, Kenneth Graunke wrote: > On 10/05/2013 03:38 AM, Chris Forbes wrote: >> ARB_gpu_shader5 introduces new variants of textureGather* which have an >> explicit component selector, rather

Re: [Mesa-dev] [PATCH 06/19] glsl: Refactor code to check that identifier names are valid.

2013-10-05 Thread Kenneth Graunke
On 10/02/2013 05:45 PM, Paul Berry wrote: > GLSL reserves identifiers beginning with "gl_" or containing "__", but > we haven't been consistent about enforcing this rule. This patch > makes a new function to check whether identifier names are valid. In > the process it closes a loophole where we

Re: [Mesa-dev] [PATCH 02/19] glsl: Fix block name of built-in gl_PerVertex interface block.

2013-10-05 Thread Kenneth Graunke
On 10/02/2013 05:45 PM, Paul Berry wrote: > Previously, we erroneously used the name "gl_in" for both the block > name and the instance name. > --- > src/glsl/builtin_variables.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/b

Re: [Mesa-dev] [PATCH 1/7] i965: Remove dead arguments from prog_data_compare.

2013-10-05 Thread Kenneth Graunke
On 10/04/2013 03:44 PM, Eric Anholt wrote: > --- > src/mesa/drivers/dri/i965/brw_context.h | 3 +-- > src/mesa/drivers/dri/i965/brw_state_cache.c | 4 +--- > src/mesa/drivers/dri/i965/brw_vec4_gs.c | 3 +-- > src/mesa/drivers/dri/i965/brw_vec4_gs.h | 3 +-- > src/mesa/drivers/dri/i965/

Re: [Mesa-dev] [PATCH 06/10] i965: Don't dead-code eliminate instructions that write to the accumulator.

2013-10-05 Thread Kenneth Graunke
On 09/27/2013 06:17 PM, Matt Turner wrote: > v2: Set destination register using brw_null_reg(). > --- > src/mesa/drivers/dri/i965/brw_fs.cpp | 15 ++- > src/mesa/drivers/dri/i965/brw_vec4.cpp | 15 ++- > 2 files changed, 28 insertions(+), 2 deletions(-) > > diff --git a/

Re: [Mesa-dev] [PATCH] docs: Mark off KHR_debug, update relnotes

2013-10-05 Thread Kenneth Graunke
On 10/05/2013 02:00 AM, Timothy Arceri wrote: > > Signed-off-by: Timothy Arceri > --- > docs/GL3.txt |2 +- > docs/relnotes/9.3.html |1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/docs/GL3.txt b/docs/GL3.txt > index 630fd99..6e5a868 100644 > --- a/doc

Re: [Mesa-dev] [PATCH 0/2] ARB_conservative_depth support for i965 Gen7+

2013-10-05 Thread Kenneth Graunke
On 10/05/2013 02:19 AM, Chris Forbes wrote: > I haven't tested this thoroughly, but this is how it looks like > it ought to work from the PRM. Series is: Reviewed-by: Kenneth Graunke Please also update GL3.txt. Thanks for finally finishing this! ___ m

Re: [Mesa-dev] [PATCH 6/6] i965: enable ARB_texture_query_levels on Gen6+

2013-10-05 Thread Kenneth Graunke
On 10/04/2013 09:47 PM, Matt Turner wrote: > On Fri, Oct 4, 2013 at 9:17 PM, Chris Forbes wrote: >> Theoretically would work on Gen5 as well but requires GLSL 1.30, which >> is not (yet) enabled by default there. > > In that case, just do > > ctx->Extensions.ARB_texture_query_levels = ctx->Const

Re: [Mesa-dev] [PATCH 4/6] i965/fs: implement ir_query_levels

2013-10-05 Thread Kenneth Graunke
On 10/04/2013 09:17 PM, Chris Forbes wrote: > Signed-off-by: Chris Forbes > --- > src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 20 +++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp > b/src/mesa/drivers/dri/i965

Re: [Mesa-dev] [PATCH 2/6] glsl: add plumbing for GL_ARB_texture_query_levels

2013-10-05 Thread Kenneth Graunke
On 10/04/2013 09:17 PM, Chris Forbes wrote: > Signed-off-by: Chris Forbes > --- > src/glsl/builtin_functions.cpp | 56 > + > src/glsl/glcpp/glcpp-parse.y| 3 ++ > src/glsl/glsl_parser_extras.cpp | 1 + > src/glsl/glsl_parser_extras.h |

Re: [Mesa-dev] [PATCH 5/6] i965/vs: implement ir_query_levels

2013-10-05 Thread Kenneth Graunke
On 10/04/2013 09:17 PM, Chris Forbes wrote: > Signed-off-by: Chris Forbes > --- > src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 15 ++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > b/src/mesa/drivers/dri/i965/

Re: [Mesa-dev] [PATCH 5/5] i965/ivb: Flag RG32F quirk for texture gather regardless of swizzles

2013-10-05 Thread Kenneth Graunke
On 10/05/2013 03:38 AM, Chris Forbes wrote: > As of ARB_gpu_shader5, textureGather doesn't always read the > post-swizzle RED channel -- so we can't just look at the red swizzle > state. > > Theoretically we could only flag the quirk if *some* green swizzle is in > use, but that's probably more tr

Re: [Mesa-dev] [PATCH 3/5] i965/fs: Add support for textureGather(.., comp)

2013-10-05 Thread Kenneth Graunke
On 10/05/2013 03:38 AM, Chris Forbes wrote: > - For HSW: Select the channel based on the component selected (swizzle > is done in HW) > - For IVB: Select the channel based on the swizzle state for the > component selected. Only apply the RG32F w/a if we actually want > green -- we're about to

Re: [Mesa-dev] [PATCH 1/5] glsl: Add support for specifying the component in textureGather

2013-10-05 Thread Kenneth Graunke
On 10/05/2013 03:38 AM, Chris Forbes wrote: > ARB_gpu_shader5 introduces new variants of textureGather* which have an > explicit component selector, rather than relying purely on the sampler's > swizzle state. > > This patch adds the GLSL plumbing for the extra parameter. > > Signed-off-by: Chris

Re: [Mesa-dev] [PATCH 3/4] glsl/gs: handle gl_ClipDistance geometry input in lower_clip_distance.

2013-10-05 Thread Paul Berry
On 28 September 2013 14:59, Paul Berry wrote: > On 27 September 2013 14:32, Ian Romanick wrote: > >> There are some bits of this patch I'm trying to understand. I think >> they can be cleared up by one question below... >> >> On 09/14/2013 01:00 PM, Paul Berry wrote: >> > From: Bryan Cain >> >

[Mesa-dev] [PATCH 5/5] i965/ivb: Flag RG32F quirk for texture gather regardless of swizzles

2013-10-05 Thread Chris Forbes
As of ARB_gpu_shader5, textureGather doesn't always read the post-swizzle RED channel -- so we can't just look at the red swizzle state. Theoretically we could only flag the quirk if *some* green swizzle is in use, but that's probably more trouble than it's worth. Signed-off-by: Chris Forbes ---

[Mesa-dev] [PATCH 4/5] i965/vs: Add support for textureGather(.., comp)

2013-10-05 Thread Chris Forbes
- For HSW: Select the channel based on the component selected (swizzle is done in HW) - For IVB: Select the channel based on the swizzle state for the component selected. Only apply the RG32F w/a if we actually want green -- we're about to flag it regardless of swizzle state. Signed-off-by:

[Mesa-dev] [PATCH 3/5] i965/fs: Add support for textureGather(.., comp)

2013-10-05 Thread Chris Forbes
- For HSW: Select the channel based on the component selected (swizzle is done in HW) - For IVB: Select the channel based on the swizzle state for the component selected. Only apply the RG32F w/a if we actually want green -- we're about to flag it regardless of swizzle state. Signed-off-by:

[Mesa-dev] [PATCH 2/5] glsl: add ARB_gpu_shader5's additional textureGather signatures

2013-10-05 Thread Chris Forbes
- gsampler2DRect support - optional `comp` parameter Future patches will add shadow sampler support and textureGatherOffsets(). Signed-off-by: Chris Forbes --- src/glsl/builtin_functions.cpp | 27 ++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/glsl

[Mesa-dev] [PATCH 1/5] glsl: Add support for specifying the component in textureGather

2013-10-05 Thread Chris Forbes
ARB_gpu_shader5 introduces new variants of textureGather* which have an explicit component selector, rather than relying purely on the sampler's swizzle state. This patch adds the GLSL plumbing for the extra parameter. Signed-off-by: Chris Forbes --- src/glsl/builtin_functions.cpp | 11

[Mesa-dev] [PATCH 0/5] ARB_gpu_shader5 textureGather enhancements for i965

2013-10-05 Thread Chris Forbes
This series adds some of the new textureGather variants from ARB_gpu_shader5, and implementation for i965 Gen7+. - Use with gsampler2DRect - Component select in the shader ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop

Re: [Mesa-dev] [PATCH 5/6] i965/vs: implement ir_query_levels

2013-10-05 Thread Chris Forbes
Eek -- so I am. Thanks for spotting this. On Sat, Oct 5, 2013 at 8:07 PM, Christoph Brill wrote: > 2013/10/5 Chris Forbes >> >> Signed-off-by: Chris Forbes >> --- >> src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 15 ++- >> 1 file changed, 14 insertions(+), 1 deletion(-) >> >> di

[Mesa-dev] [PATCH 2/2] i965: Enable ARB_conservative_depth for Gen7+.

2013-10-05 Thread Chris Forbes
Signed-off-by: Chris Forbes --- src/mesa/drivers/dri/i965/intel_extensions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 52076f7..6f024b4 100644 --- a/src/mesa/drivers/dri/i965/intel_extensi

[Mesa-dev] [PATCH 1/2] i965/wm: Program correct conservative depth modes

2013-10-05 Thread Chris Forbes
Signed-off-by: Chris Forbes --- src/mesa/drivers/dri/i965/gen7_wm_state.c | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index 80073cd..7ddeb6e 100644 --- a/src/mesa/drive

[Mesa-dev] [PATCH 0/2] ARB_conservative_depth support for i965 Gen7+

2013-10-05 Thread Chris Forbes
I haven't tested this thoroughly, but this is how it looks like it ought to work from the PRM. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] docs: Mark off KHR_debug, update relnotes

2013-10-05 Thread Timothy Arceri
Signed-off-by: Timothy Arceri --- docs/GL3.txt |2 +- docs/relnotes/9.3.html |1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/GL3.txt b/docs/GL3.txt index 630fd99..6e5a868 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -145,7 +145,7 @@ ARB_ES3_compatibi

Re: [Mesa-dev] [PATCH 5/6] i965/vs: implement ir_query_levels

2013-10-05 Thread Christoph Brill
2013/10/5 Chris Forbes > Signed-off-by: Chris Forbes > --- > src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 15 ++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp