Re: [Mesa-dev] [PATCH 0/6] glsl: Add support for varying structs.

2013-01-24 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Mon, Jan 21, 2013 at 2:16 PM, Paul Berry stereotype...@gmail.com wrote: This patch series adds support for varying structs, which are a required part of GLSL ES 3.00 and GLSL 1.50. I can see two principal ways to implement this feature

Re: [Mesa-dev] [PATCH 28/32] glsl: Add link_uniform_blocks to calculate all UBO data at link-time

2013-01-25 Thread Jordan Justen
On Tue, Jan 22, 2013 at 12:52 AM, Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Calculate all of the block member offsets, the IndexNames, and everything else to do with every UBO. Signed-off-by: Ian Romanick ian.d.roman...@intel.com ---

Re: [Mesa-dev] [PATCH 00/32] UBOs for OpenGL ES 3.0

2013-01-25 Thread Jordan Justen
23 26-31 Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Tue, Jan 22, 2013 at 12:51 AM, Ian Romanick i...@freedesktop.org wrote: So here it is. This is the last of the UBO instance and array instance rework for the linker. It's a giant pile of patches, so let me explain what's going

Re: [Mesa-dev] [PATCH] gles3: Update gl3.h

2013-01-25 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Fri, Jan 25, 2013 at 4:07 PM, Matt Turner matts...@gmail.com wrote: Contains a fix for Khronos bug 9557. --- include/GLES3/gl3.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/GLES3/gl3.h b/include

Re: [Mesa-dev] [PATCH 1/2] vbo: Print display list debug using printf() like dlist.c does.

2013-02-01 Thread Jordan Justen
On Fri, Feb 1, 2013 at 1:34 PM, Eric Anholt e...@anholt.net wrote: Otherwise, the stderr and stdout debug end up interleaved wrong when I pipe them to a file. Shouldn't we convert dlist.c to _mesa_debug instead? It doesn't seem right for mesa to use printf... -Jordan ---

Re: [Mesa-dev] [PATCH 2/2] vbo: Merge primitive drawing requests in display lists.

2013-02-01 Thread Jordan Justen
*this_prim = prim_list + i; + + if (this_prim-mode == prev_prim-mode + this_prim-mode == GL_QUADS + this_prim-count % 4 == 0 + prev_prim-count % 4 == 0 It seems like you might be able cover GL_POINTS, GL_LINES and GL_TRIANGLES fairly easily too. Reviewed-by: Jordan

Re: [Mesa-dev] [PATCH 4/4] glsl: Support transform feedback of varying structs.

2013-02-02 Thread Jordan Justen
so the logic is shared with how we handle Remove which? In commit message 3/4: suceeds = succeeds So, I guess I could only find comments for your commit messages. :) Series Reviewed-by: Jordan Justen jordan.l.jus...@intel.com uniforms. NOTE: This is a candidate for the 9.1 branch. --- src

Re: [Mesa-dev] [PATCH] i965: Fix Vertex URB Read Length calculation in 3DSTATE_SF on Gen6.

2013-02-02 Thread Jordan Justen
in PlaneShift (since the varying reordering code landed), and Piglit test . Tested-by: Jordan Justen jordan.l.jus...@intel.com with my fbo-5-varyings test. NOTE: This is a candidate for all stable branches. (The code needs to get cleaned up - the final result is quite ugly - but I

Re: [Mesa-dev] [PATCH 1/2] vbo: Print display list debug using printf() like dlist.c does.

2013-02-05 Thread Jordan Justen
On Mon, Feb 4, 2013 at 7:30 PM, Eric Anholt e...@anholt.net wrote: Jordan Justen jljus...@gmail.com writes: On Fri, Feb 1, 2013 at 1:34 PM, Eric Anholt e...@anholt.net wrote: Otherwise, the stderr and stdout debug end up interleaved wrong when I pipe them to a file. Shouldn't we convert

Re: [Mesa-dev] [PATCH] CopyTexImage: Don't check sRGB vs LINEAR for desktop GL

2013-02-12 Thread Jordan Justen
On Mon, Feb 11, 2013 at 4:50 PM, Anuj Phogat anuj.pho...@gmail.com wrote: On Mon, Feb 11, 2013 at 3:39 PM, Jordan Justen jordan.l.jus...@intel.com wrote: In OpenGL 4.3, new language was added that would require this check. But, if this check results in broken applications then perhaps

[Mesa-dev] [PATCH] glsl: Remove VS output varyings which are optimized out of the FS

2013-02-12 Thread Jordan Justen
Previously when an input varying was optimized out of the FS we would still retain it as an output of the VS. We now build a hash of live FS input varyings rather than looking in the FS symbol table. (The FS symbol table will still contain the optimized out varyings.) Signed-off-by: Jordan

Re: [Mesa-dev] [PATCH] glsl: Remove VS output varyings which are optimized out of the FS

2013-02-12 Thread Jordan Justen
On Tue, Feb 12, 2013 at 6:59 PM, Jordan Justen jordan.l.jus...@intel.com wrote: Previously when an input varying was optimized out of the FS we would still retain it as an output of the VS. We now build a hash of live FS input varyings rather than looking in the FS symbol table. (The FS symbol

[Mesa-dev] [PATCH 0/4] Fix issue with overriding GL to 3.2 and GLSL to 1.50

2013-02-22 Thread Jordan Justen
override was 1.50. Jordan Justen (4): glsl: allow GLSL compiler version to be overridden to 1.50 mesa version: add _mesa_get_gl_version_override intel: update max versions based on MESA_GL_VERSION_OVERRIDE intel: Enable __DRI_API_OPENGL_CORE api with dri2 contexts src/glsl

[Mesa-dev] [PATCH 2/4] mesa version: add _mesa_get_gl_version_override

2013-02-22 Thread Jordan Justen
This will allow other code to get access to the override version before a context is available. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/mesa/main/version.c | 94 +-- src/mesa/main/version.h |3 ++ 2 files changed, 70

[Mesa-dev] [PATCH 3/4] intel: update max versions based on MESA_GL_VERSION_OVERRIDE

2013-02-22 Thread Jordan Justen
If the override is version is = 3.1, then update the max_gl_core_version. Otherwise, update max_gl_compat_version. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/mesa/drivers/dri/intel/intel_screen.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/mesa

[Mesa-dev] [PATCH 1/4] glsl: allow GLSL compiler version to be overridden to 1.50

2013-02-22 Thread Jordan Justen
-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/builtin_variables.cpp |2 ++ src/glsl/glsl_types.cpp|1 + 2 files changed, 3 insertions(+) diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index ccee774..53c4c51 100644 --- a/src/glsl

Re: [Mesa-dev] [PATCH 04/14] mesa: Fix _mesa_problem() on context destroy after application debug output

2013-02-23 Thread Jordan Justen
On Fri, Feb 22, 2013 at 7:52 PM, Eric Anholt e...@anholt.net wrote: This was apparently not noticed because we don't have any testing of application-generated debug output. However, as I'm changing the GL-generated debug output to use the same path as application/middleware-generated debug

Re: [Mesa-dev] [PATCH 03/14] mesa: Move debug type/severity enums to mesa core.

2013-02-23 Thread Jordan Justen
On Fri, Feb 22, 2013 at 7:52 PM, Eric Anholt e...@anholt.net wrote: +static enum mesa_debug_type +gl_enum_to_debug_type(GLenum e) +{ + int i; + + for (i = 0; i Elements(debug_type_enums); i++) { I guess we have both Elements and ARRAY_SIZE. Should we try to merge these? Elements

Re: [Mesa-dev] [PATCH 12/14] mesa: Remove unused gl_winsys_error enum.

2013-02-23 Thread Jordan Justen
On Fri, Feb 22, 2013 at 7:52 PM, Eric Anholt e...@anholt.net wrote: --- src/mesa/main/mtypes.h |8 1 file changed, 8 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 11e1f9e..65c823d 100644 --- a/src/mesa/main/mtypes.h +++

Re: [Mesa-dev] GL_ARB_debug_output from drivers

2013-02-23 Thread Jordan Justen
Series Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Fri, Feb 22, 2013 at 7:52 PM, Eric Anholt e...@anholt.net wrote: One of the features Valve asked for, that they expected after using other drivers, is that they can easily get information about performance traps (and other

Re: [Mesa-dev] [PATCH 0/9] remove mfeatures.h file

2013-02-25 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Sat, Feb 23, 2013 at 7:29 AM, Brian Paul bri...@vmware.com wrote: This series removes the dependencies on the mfeatures.h file and the file itself. I'd appreciated someone doing a test build of this series to double-check my work. Do

[Mesa-dev] [PATCH] texobj: add verbose api trace messages to several routines

2013-02-25 Thread Jordan Justen
Motivated by wanting to see if GenTextures was called by an application while debugging another Steam overlay issue. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/mesa/main/texobj.c | 21 + 1 file changed, 21 insertions(+) diff --git a/src/mesa/main

Re: [Mesa-dev] [PATCH 0/9] remove mfeatures.h file

2013-02-26 Thread Jordan Justen
On Sat, Feb 23, 2013 at 7:29 AM, Brian Paul bri...@vmware.com wrote: This series removes the dependencies on the mfeatures.h file and the file itself. I'd appreciated someone doing a test build of this series to double-check my work. I'm getting a build error: GENmain/get_hash.h

Re: [Mesa-dev] [PATCH 0/9] remove mfeatures.h file

2013-02-26 Thread Jordan Justen
On Tue, Feb 26, 2013 at 10:16 AM, Brian Paul bri...@vmware.com wrote: On 02/26/2013 10:09 AM, Jordan Justen wrote: On Sat, Feb 23, 2013 at 7:29 AM, Brian Paulbri...@vmware.com wrote: This series removes the dependencies on the mfeatures.h file and the file itself. I'd appreciated someone

[Mesa-dev] [PATCH] attrib: push/pop FRAGMENT_PROGRAM_ARB state

2013-02-28 Thread Jordan Justen
This requirement was added by ARB_fragment_program When the Steam overlay is enabled, this fixes: * Menu corruption with the Puddle game * The screen going black on Rochard when the Steam overlay is accessed NOTE: This is a candidate for the 9.0 and 9.1 branches. Signed-off-by: Jordan Justen

Re: [Mesa-dev] remove mfeatures.h, take two

2013-03-11 Thread Jordan Justen
On Mon, Mar 11, 2013 at 5:28 PM, Brian Paul bri...@vmware.com wrote: On Sat, Mar 2, 2013 at 7:29 AM, Brian Paul bri...@vmware.com wrote: I've respun my remove-mfeatures branch as remove-mfeatures-2. It's in my repo on freedesktop.org This removes the mfeatures.h file and the last of the

[Mesa-dev] [PATCH 00/12] GLSL interface blocks support

2013-03-12 Thread Jordan Justen
issues have been sent to piglit list Jordan Justen (12): glsl: rename ast_uniform_block to ast_interface_block glsl parser: rename uniform block to interface block glsl: parse in/out types for interface blocks glsl parser: reject VS+in FS+out interface blocks glsl parser: on desktop GL

[Mesa-dev] [PATCH 02/12] glsl parser: rename uniform block to interface block

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index cd33078..33b74ea 100644 --- a/src/glsl/glsl_parser.yy +++ b

[Mesa-dev] [PATCH 03/12] glsl: parse in/out types for interface blocks

2013-03-12 Thread Jordan Justen
Previously only 'uniform' was allowed for uniform blocks. Now, in/out can be parsed, but it will only be allowed for GLSL = 150. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 60 ++- 1 file changed, 49

[Mesa-dev] [PATCH 01/12] glsl: rename ast_uniform_block to ast_interface_block

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast.h |4 ++-- src/glsl/ast_to_hir.cpp |6 +++--- src/glsl/glsl_parser.yy | 14 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glsl/ast.h b/src/glsl/ast.h index fcc6b45

[Mesa-dev] [PATCH 04/12] glsl parser: reject VS+in FS+out interface blocks

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 7adc06d..8e6b04d 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy

[Mesa-dev] [PATCH 06/12] glsl parser: allow in out for interface block members

2013-03-12 Thread Jordan Justen
qualifier type is used with the block and each member. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 47 ++- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl

[Mesa-dev] [PATCH 08/12] glsl ast_to_hir: support in/out for interface blocks

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast_to_hir.cpp | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 40f3188..ee54c70 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl

[Mesa-dev] [PATCH 07/12] glsl parser: handle interface block member qualifier

2013-03-12 Thread Jordan Justen
. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 17 + 1 file changed, 17 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index d21ca2d..ac1d8ed 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy

[Mesa-dev] [PATCH 05/12] glsl parser: on desktop GL require GLSL 150 for instance names

2013-03-12 Thread Jordan Justen
Interface blocks in GLSL 150 allow an instance name to be used. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index

[Mesa-dev] [PATCH 09/12] glsl ir: add as_dereference_record

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ir.h |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/ir.h b/src/glsl/ir.h index 393b486..c6bfb11 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -120,6 +120,7 @@ public: virtual class ir_dereference

[Mesa-dev] [PATCH 10/12] glsl linker: cross validate interface block types between stages

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/linker.cpp | 13 + 1 file changed, 13 insertions(+) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 57e7a9a..b33df37 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -478,6 +478,7

[Mesa-dev] [PATCH 11/12] glsl linker: remove interface block instance names

2013-03-12 Thread Jordan Justen
Convert interface blocks with instance names into flat interface blocks without an instance name. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/Makefile.sources |1 + src/glsl/ir_optimization.h|1 + src/glsl/linker.cpp

[Mesa-dev] [PATCH 12/12] glsl link_varyings: link interface blocks using the block name

2013-03-12 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/link_varyings.cpp | 33 + 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 616933d..6c5ec6f 100644 --- a/src/glsl

Re: [Mesa-dev] remove mfeatures.h, take two

2013-03-12 Thread Jordan Justen
On Mon, Mar 11, 2013 at 5:28 PM, Brian Paul bri...@vmware.com wrote: On Sat, Mar 2, 2013 at 7:29 AM, Brian Paul bri...@vmware.com wrote: I've respun my remove-mfeatures branch as remove-mfeatures-2. It's in my repo on freedesktop.org This removes the mfeatures.h file and the last of the

Re: [Mesa-dev] remove mfeatures.h, take two

2013-03-12 Thread Jordan Justen
On Tue, Mar 12, 2013 at 2:12 PM, Brian Paul bri...@vmware.com wrote: On 03/12/2013 02:52 PM, Jordan Justen wrote: On Mon, Mar 11, 2013 at 5:28 PM, Brian Paulbri...@vmware.com wrote: On Sat, Mar 2, 2013 at 7:29 AM, Brian Paulbri...@vmware.com wrote: I've respun my remove-mfeatures branch

Re: [Mesa-dev] [PATCH 1/2] mesa: Don't validate IR trees on non-debug builds.

2013-03-15 Thread Jordan Justen
On Fri, Mar 15, 2013 at 12:04 PM, Eric Anholt e...@anholt.net wrote: This was taking 5% of CPU on TF2's load time. Seems like a candidate for stable. -Jordan --- src/mesa/program/ir_to_mesa.cpp |4 1 file changed, 4 insertions(+) diff --git a/src/mesa/program/ir_to_mesa.cpp

Re: [Mesa-dev] Google Summer of Code ideas needed

2013-03-18 Thread Jordan Justen
On Wed, Mar 13, 2013 at 10:11 AM, Tom Stellard t...@stellard.net wrote: - A brief description of the project - A difficulty rating (e.g. easy, medium, hard) - The skills / programming languages required GL/GLSL tests for GL 3.2, 3.3 in the piglit test suite Difficulty: Easy-Medium Skills

[Mesa-dev] [PATCH v2 00/15] GLSL 1.50 interface blocks support

2013-03-18 Thread Jordan Justen
been sent to piglit list Jordan Justen (15): glsl: rename ast_uniform_block to ast_interface_block glsl parser: rename uniform block to interface block glsl: parse in/out types for interface blocks glsl parser: reject VS+in FS+out interface blocks glsl parser: on desktop GL require GLSL

[Mesa-dev] [PATCH v2 01/15] glsl: rename ast_uniform_block to ast_interface_block

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast.h |4 ++-- src/glsl/ast_to_hir.cpp |6 +++--- src/glsl/glsl_parser.yy | 14 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glsl/ast.h b/src/glsl/ast.h index fcc6b45

[Mesa-dev] [PATCH v2 02/15] glsl parser: rename uniform block to interface block

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index cd33078..33b74ea 100644 --- a/src/glsl/glsl_parser.yy +++ b

[Mesa-dev] [PATCH v2 03/15] glsl: parse in/out types for interface blocks

2013-03-18 Thread Jordan Justen
Previously only 'uniform' was allowed for uniform blocks. Now, in/out can be parsed, but it will only be allowed for GLSL = 150. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 60 ++- 1 file changed, 49

[Mesa-dev] [PATCH v2 04/15] glsl parser: reject VS+in FS+out interface blocks

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 7adc06d..8e6b04d 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy

[Mesa-dev] [PATCH v2 05/15] glsl parser: on desktop GL require GLSL 150 for instance names

2013-03-18 Thread Jordan Justen
Interface blocks in GLSL 150 allow an instance name to be used. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index

[Mesa-dev] [PATCH v2 07/15] glsl parser: handle interface block member qualifier

2013-03-18 Thread Jordan Justen
. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 17 + 1 file changed, 17 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index d21ca2d..ac1d8ed 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy

[Mesa-dev] [PATCH v2 06/15] glsl parser: allow in out for interface block members

2013-03-18 Thread Jordan Justen
qualifier type is used with the block and each member. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 47 ++- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl

[Mesa-dev] [PATCH v2 08/15] glsl ast_to_hir: support in/out for interface blocks

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast_to_hir.cpp | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 40f3188..ee54c70 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl

[Mesa-dev] [PATCH v2 09/15] glsl ir: add as_dereference_record

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ir.h |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/ir.h b/src/glsl/ir.h index bbfec69..ee27dea 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -120,6 +120,7 @@ public: virtual class ir_dereference

[Mesa-dev] [PATCH v2 11/15] glsl linker: remove interface block instance names

2013-03-18 Thread Jordan Justen
Convert interface blocks with instance names into flat interface blocks without an instance name. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/Makefile.sources |1 + src/glsl/ir_optimization.h|1 + src/glsl/linker.cpp

[Mesa-dev] [PATCH v2 10/15] glsl linker: cross validate interface block types between stages

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/linker.cpp | 13 + 1 file changed, 13 insertions(+) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 29856b0..acbdd2f 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -478,6 +478,7

[Mesa-dev] [PATCH v2 12/15] glsl link_varyings: link interface blocks using the block name

2013-03-18 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/link_varyings.cpp | 33 + 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 04c9fdd..b374049 100644 --- a/src/glsl

[Mesa-dev] [PATCH v2 13/15] glsl linker: support arrays of interface block instances

2013-03-18 Thread Jordan Justen
With this change we now support interface block arrays. For example, cases like this: out block_name { float f; } block_instance[2]; This allows Mesa to pass the piglit glsl-1.50 test: * execution/interface-blocks-complex-vs-fs.shader_test Signed-off-by: Jordan Justen jordan.l.jus

[Mesa-dev] [PATCH v2 14/15] glsl linker: compare interface blocks during intrastage linking

2013-03-18 Thread Jordan Justen
Verify that interface blocks match when combining compilation units at the same stage. (For example, when merging all vertex shaders.) Fixes piglit glsl-1.50 test: * linker/interface-blocks-multiple-vs-member-count-mismatch.shader_test Signed-off-by: Jordan Justen jordan.l.jus...@intel.com

[Mesa-dev] [PATCH v2 15/15] glsl linker: compare interface blocks during interstage linking

2013-03-18 Thread Jordan Justen
Verify that interface blocks match when linking separate shader stages into a program. Fixes piglit glsl-1.50 tests: * linker/interface-blocks-vs-fs-member-count-mismatch.shader_test * linker/interface-blocks-vs-fs-member-order-mismatch.shader_test Signed-off-by: Jordan Justen jordan.l.jus

Re: [Mesa-dev] Basic GLSL 1.50 support: new types built-in functions

2013-03-19 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Mon, Mar 18, 2013 at 6:57 PM, Kenneth Graunke kenn...@whitecape.org wrote: This series improves our basic GLSL 1.50 support. First, it makes 1.50 shaders using built-in functions work. Secondly, it adds the new types and built-ins from

Re: [Mesa-dev] [PATCH v2 13/15] glsl linker: support arrays of interface block instances

2013-03-19 Thread Jordan Justen
On Tue, Mar 19, 2013 at 3:57 AM, Pohjolainen, Topi topi.pohjolai...@intel.com wrote: On Mon, Mar 18, 2013 at 04:35:10PM -0700, Jordan Justen wrote: With this change we now support interface block arrays. For example, cases like this: out block_name { float f; } block_instance[2

Re: [Mesa-dev] [PATCH v2 06/15] glsl parser: allow in out for interface block members

2013-03-22 Thread Jordan Justen
On Wed, Mar 20, 2013 at 5:32 PM, Eric Anholt e...@anholt.net wrote: Jordan Justen jordan.l.jus...@intel.com writes: Previously uniform blocks allowed for the 'uniform' keyword to be used with members of a uniform blocks. With interface blocks 'in' can be used on 'in' interface block members

Re: [Mesa-dev] [PATCH v2 03/15] glsl: parse in/out types for interface blocks

2013-03-24 Thread Jordan Justen
On Wed, Mar 20, 2013 at 5:19 PM, Eric Anholt e...@anholt.net wrote: Jordan Justen jordan.l.jus...@intel.com writes: Previously only 'uniform' was allowed for uniform blocks. Now, in/out can be parsed, but it will only be allowed for GLSL = 150. basic_interface_block: - UNIFORM

Re: [Mesa-dev] OpenGL ES 3.0 support

2013-03-25 Thread Jordan Justen
On Mon, Mar 25, 2013 at 9:41 AM, violin yanev violin.ya...@gmail.com wrote: Hello, I was eager to try the OpenGL ES 3.0 support on the newest Mesa 9.1. I installed the latest Fedora Rawhide on my Sandy Bridge. I believe this Fedora commit which disabled GL3 for Intel graphics will also

[Mesa-dev] [PATCH v3 02/17] glsl parser: rename uniform block to interface block

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/glsl_parser.yy | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glsl/glsl_parser.yy b

[Mesa-dev] [PATCH v3 03/17] glsl: parse in/out types for interface blocks

2013-03-25 Thread Jordan Justen
Previously only 'uniform' was allowed for uniform blocks. Now, in/out can be parsed, but it will only be allowed for GLSL = 150. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net --- src/glsl/glsl_parser.yy | 51

[Mesa-dev] [PATCH v3 06/17] glsl parser: handle interface block member qualifier

2013-03-25 Thread Jordan Justen
with the member, it will adopt the same type as the interface block. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 26 ++ 1 file changed, 26 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 70764d6

[Mesa-dev] [PATCH v3 04/17] glsl parser: reject VS+in FS+out interface blocks

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/glsl_parser.yy | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy

[Mesa-dev] [PATCH v3 10/17] glsl ast_to_hir: move uniform block symbols to interface blocks namespace

2013-03-25 Thread Jordan Justen
Uniform/interface blocks are a separate namespace from types. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast_to_hir.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 612b3e4..9913309 100644

[Mesa-dev] [PATCH v3 08/17] glsl parser: allow in out for interface block members

2013-03-25 Thread Jordan Justen
qualifier type is used with the block and each member. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_parser.yy | 47 ++- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl

[Mesa-dev] [PATCH v3 01/17] glsl: rename ast_uniform_block to ast_interface_block

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/ast.h |4 ++-- src/glsl/ast_to_hir.cpp |6 +++--- src/glsl/glsl_parser.yy | 14 +++--- 3 files changed, 12

[Mesa-dev] [PATCH v3 11/17] glsl ast_to_hir: reject row/column_major for in/out interface blocks

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast_to_hir.cpp |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 9913309..25fcee4 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl

[Mesa-dev] [PATCH v3 00/17] GLSL 1.50 interface blocks support

2013-03-25 Thread Jordan Justen
* Piglit tests for known issues have been sent to piglit list Jordan Justen (17): glsl: rename ast_uniform_block to ast_interface_block glsl parser: rename uniform block to interface block glsl: parse in/out types for interface blocks glsl parser: reject VS+in FS+out interface blocks glsl

[Mesa-dev] [PATCH v3 05/17] glsl parser: on desktop GL require GLSL 150 for instance names

2013-03-25 Thread Jordan Justen
Interface blocks in GLSL 150 allow an instance name to be used. v2: * use state-check_version Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/glsl_parser.yy |8 +++- 1 file

[Mesa-dev] [PATCH v3 07/17] glsl ast_to_hir: reject interpolation qualifiers for uniform blocks

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/ast_to_hir.cpp |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 40f3188..612b3e4 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -4187,6

[Mesa-dev] [PATCH v3 09/17] glsl_symbol_table: add interface block namespaces

2013-03-25 Thread Jordan Justen
For interface blocks, there are three separate namespaces for uniform, input and output blocks. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/glsl_symbol_table.cpp | 84 ++-- src/glsl/glsl_symbol_table.h |4 ++ 2 files changed, 85

[Mesa-dev] [PATCH v3 12/17] glsl ast_to_hir: support in/out for interface blocks

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/ast_to_hir.cpp | 28 ++-- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 25fcee4

[Mesa-dev] [PATCH v3 16/17] glsl linker: compare interface blocks during intrastage linking

2013-03-25 Thread Jordan Justen
Verify that interface blocks match when combining compilation units at the same stage. (For example, when merging all vertex shaders.) Fixes piglit glsl-1.50 test: * linker/interface-blocks-multiple-vs-member-count-mismatch.shader_test Signed-off-by: Jordan Justen jordan.l.jus...@intel.com

[Mesa-dev] [PATCH v3 13/17] glsl linker: remove interface block instance names

2013-03-25 Thread Jordan Justen
Convert interface blocks with instance names into flat interface blocks without an instance name. Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/Makefile.sources |1 + src/glsl/ir_optimization.h|1 + src/glsl/linker.cpp

[Mesa-dev] [PATCH v3 14/17] glsl link_varyings: link interface blocks using the block name

2013-03-25 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com --- src/glsl/link_varyings.cpp | 33 + 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 04c9fdd..b374049 100644 --- a/src/glsl

[Mesa-dev] [PATCH v3 15/17] glsl linker: support arrays of interface block instances

2013-03-25 Thread Jordan Justen
With this change we now support interface block arrays. For example, cases like this: out block_name { float f; } block_instance[2]; This allows Mesa to pass the piglit glsl-1.50 test: * execution/interface-blocks-complex-vs-fs.shader_test Signed-off-by: Jordan Justen jordan.l.jus

[Mesa-dev] [PATCH v3 17/17] glsl linker: compare interface blocks during interstage linking

2013-03-25 Thread Jordan Justen
Verify that interface blocks match when linking separate shader stages into a program. Fixes piglit glsl-1.50 tests: * linker/interface-blocks-vs-fs-member-count-mismatch.shader_test * linker/interface-blocks-vs-fs-member-order-mismatch.shader_test Signed-off-by: Jordan Justen jordan.l.jus

Re: [Mesa-dev] OpenGL ES 3.0 support

2013-03-26 Thread Jordan Justen
On Tue, Mar 26, 2013 at 10:34 AM, Jerome Glisse j.gli...@gmail.com wrote: On Tue, Mar 26, 2013 at 4:39 AM, violin yanev violin.ya...@gmail.com wrote: Thanks for your replies guys! The output of eglinfo is: EGL API version: 1.4 EGL vendor string: Mesa Project EGL version string: 1.4 (DRI2)

Re: [Mesa-dev] OpenGL ES 3.0 support

2013-03-26 Thread Jordan Justen
, and then set the LIBGL_DRIVERS_DIR environment variable to the directory where you downloaded the library. -Jordan On Mon, Mar 25, 2013 at 5:59 PM, Jordan Justen jljus...@gmail.com wrote: On Mon, Mar 25, 2013 at 9:41 AM, violin yanev violin.ya...@gmail.com wrote: Hello, I was eager

Re: [Mesa-dev] [PATCH 0/4] Begin some ir_dereference_array-of-a-vector rework

2013-03-28 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Wed, Mar 27, 2013 at 9:30 AM, Ian Romanick i...@freedesktop.org wrote: This is the first of three patch series that I'm going to send related to reworking ir_dereference_array of vectors. The final series end with ir_dereference_array

Re: [Mesa-dev] Mesa 9.1.2? (was Re: Mesa (9.1): 21 new commits)

2013-04-05 Thread Jordan Justen
On Fri, Apr 5, 2013 at 7:03 PM, Ian Romanick i...@freedesktop.org wrote: I just cherry picked (almost) all of the marked patches from master that have been out for two weeks or more. There are a couple that I did not pick. With all that out of the way... how does a Mesa 9.1.2 release next

Re: [Mesa-dev] [PATCH] glsl: Fix ir_print_visitor's handling of interpolation qualifiers.

2013-04-06 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Sat, Apr 6, 2013 at 7:20 PM, Paul Berry stereotype...@gmail.com wrote: This patch updates the interp[] array to match the enum glsl_interp_qualifier. --- src/glsl/ir_print_visitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion

Re: [Mesa-dev] [PATCH 1/3] glsl/linker: fix varying packing for non-flat integer varyings.

2013-04-07 Thread Jordan Justen
On Sat, Apr 6, 2013 at 7:49 PM, Paul Berry stereotype...@gmail.com wrote: + if (consumer_var == NULL) { + /* Since there is no consumer_var, the interpolation type of this + * varying cannot possibly affect rendering. Also, since the GL spec + * only requires integer

Re: [Mesa-dev] [PATCH 1/3] glsl/linker: fix varying packing for non-flat integer varyings.

2013-04-07 Thread Jordan Justen
On Sun, Apr 7, 2013 at 11:42 AM, Paul Berry stereotype...@gmail.com wrote: On 7 April 2013 11:12, Jordan Justen jljus...@gmail.com wrote: On Sat, Apr 6, 2013 at 7:49 PM, Paul Berry stereotype...@gmail.com wrote: + if (consumer_var == NULL) { + /* Since there is no consumer_var

Re: [Mesa-dev] [PATCH] i965/vs: Fix DEBUG_SHADER_TIME when VS terminates with 2 URB writes.

2013-04-07 Thread Jordan Justen
: Emit URBs until eot - if (eot) { - if (INTEL_DEBUG DEBUG_SHADER_TIME) -emit_shader_time_end(); - } + if (INTEL_DEBUG DEBUG_SHADER_TIME) + emit_shader_time_end(); Reviewed-by: Jordan Justen jordan.l.jus...@intel.com current_annotation

Re: [Mesa-dev] [PATCH 00/17] i965/vs: Generalize VS compiler back-end in preparation for GS.

2013-04-08 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Sun, Apr 7, 2013 at 3:53 PM, Paul Berry stereotype...@gmail.com wrote: This patch series lays the groundwork for the i965 geometry shader back-end by separating the functions and data structures which are specific to vertex shaders from

Re: [Mesa-dev] [PATCH] i965: Use software primitive restart when transform feedback active.

2013-04-08 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Sat, Apr 6, 2013 at 8:25 PM, Paul Berry stereotype...@gmail.com wrote: When transform feedback is active, the driver manually counts the number of primitives that run through the pipeline, so that if a batch buffer flush happens, the next

Re: [Mesa-dev] [PATCH 2/2] i965/gen7.5: Allow HW primitive restart for all primitive types.

2013-04-08 Thread Jordan Justen
Series Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Mon, Apr 8, 2013 at 11:57 AM, Paul Berry stereotype...@gmail.com wrote: Gen7.5 (Haswell) hardware supports primitive restart for all primitive types. It also handles all possible primitive restart indices. Rather than specialize

[Mesa-dev] 9.1 candidate? - Re: [PATCH] i965: Avoid segfault in gen6_upload_state

2013-04-10 Thread Jordan Justen
I think f5a80846 is a candidate for 9.1. This fixes a crash of the latest build of Anomaly Warzone Earth on the 9.1 branch. On Tue, Feb 19, 2013 at 4:27 PM, Carl Worth cwo...@cworth.org wrote: This fixes a bug introduced in commit 258453716f001eab1288d99765213 and triggered whenever rb is NULL.

[Mesa-dev] [PATCH 9.1] i965: Fix an inconsistency inb the VUE map with gl_ClipVertex on gen4/5.

2013-04-11 Thread Jordan Justen
[jordan.l.jus...@intel.com: backport for 9.1 branch] Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Cc: Kenneth Graunke kenn...@whitecape.org Cc: Eric Anholt e...@anholt.net Cc: Paul Berry stereotype...@gmail.com --- Ken: Can you test this on 9.1 with Ironlake+TF2? Eric/Paul: Does

Re: [Mesa-dev] [PATCH 01/12] build: Rename sources.mak - Makefile.sources

2013-04-12 Thread Jordan Justen
Assuming this matched your make-dist-1 branch, Series Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Thu, Apr 11, 2013 at 4:29 PM, Matt Turner matts...@gmail.com wrote: For the sake of consistency. Tested-by: Emil Velikov emil.l.veli...@gmail.com Reviewed-and-Tested-by: Andreas Boll

Re: [Mesa-dev] [PATCH 9.1] i965: Fix an inconsistency inb the VUE map with gl_ClipVertex on gen4/5.

2013-04-15 Thread Jordan Justen
NAK. I got access to gen6, and tested this patch. This backport is invalid. On Wed, Apr 10, 2013 at 8:40 PM, Jordan Justen jordan.l.jus...@intel.com wrote: From: Eric Anholt e...@anholt.net We are intentionally not allocating a slot for gl_ClipVertex. But by leaving the bit set

Re: [Mesa-dev] [PATCH] intel: Add a null pointer check before dereferencing the pointer

2013-04-16 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Tue, Apr 16, 2013 at 11:11 AM, Anuj Phogat anuj.pho...@gmail.com wrote: Signed-off-by: Anuj Phogat anuj.pho...@gmail.com --- src/mesa/drivers/dri/intel/intel_screen.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa

Re: [Mesa-dev] [PATCH] i965/vec4: Fix hypothetical use of uninitialized data in attribute_map[].

2013-04-16 Thread Jordan Justen
Reviewed-by: Jordan Justen jordan.l.jus...@intel.com On Tue, Apr 16, 2013 at 1:37 PM, Paul Berry stereotype...@gmail.com wrote: Fixes issue identified by Klocwork analysis: 'attribute_map' array elements might be used uninitialized in this function (vec4_visitor

[Mesa-dev] [PATCH 04/17] glsl parser: reject VS+in FS+out interface blocks

2013-04-19 Thread Jordan Justen
Signed-off-by: Jordan Justen jordan.l.jus...@intel.com Reviewed-by: Eric Anholt e...@anholt.net Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/glsl_parser.yy | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy

  1   2   3   4   5   6   7   8   9   10   >