glsl: Track matrix layout of variables using two bits

Graphics / Mesa 3D Graphics Library / Mesa - Ian Romanick [intel.com] - 4 August 2014 16:40 UTC

Fixes gles3conform failures in:

ES3-CTS.shaders.uniform_block.random.nested_structs_arrays_instance_arrays.3 ES3-CTS.shaders.uniform_block.random.all_per_block_buffers.13

Causes gles3conform failures in:

ES3-CTS.shaders.uniform_block.random.all_per_block_buffers.9

This failure will be fixed shortly.

v2: Use without_array() instead of older predicates.

v3: s/GLSL_MATRIX_LAYOUT_DEFAULT/GLSL_MATRIX_LAYOUT_INHERITED/g

d561e79 glsl: Track matrix layout of variables using two bits
src/glsl/ast_to_hir.cpp | 38 +++++++++++++++++++++++++++++++-------
src/glsl/ir.h | 5 +++++
src/glsl/link_uniform_blocks.cpp | 2 +-
src/glsl/link_uniforms.cpp | 31 ++++++++++++++++++++++++-------
4 files changed, 61 insertions(+), 15 deletions(-)

Upstream: cgit.freedesktop.org


  • Share