glsl: Do not add extra padding to structures

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

This code was attemping to align the base of the structure to the required alignment of the structure. However, it had two problems:

1. It was aligning the target structure member, not the base of the structure.

2. It was calculating the alignment based on the members previous to the target member instead of all the members of the structure.

Fixes gles3conform failures in:

ES3-CTS.shaders.uniform_block.random.nested_structs.6 ES3-CTS.shaders.uniform_block.random.nested_structs_arrays_instance_arrays.2 ES3-CTS.shaders.uniform_block.random.nested_structs_arrays_instance_arrays.6 ES3-CTS.shaders.uniform_block.random.all_per_block_buffers.5 ES3-CTS.shaders.uniform_block.random.all_per_block_buffers.19 ES3-CTS.shaders.uniform_block.random.all_shared_buffer.0 ES3-CTS.shaders.uniform_block.random.all_shared_buffer.2 ES3-CTS.shaders.uniform_block.random.all_shared_buffer.6 ES3-CTS.shaders.uniform_block.random.all_shared_buffer.12

v2: Fix rebase failure noticed by Matt.

b48621c glsl: Do not add extra padding to structures
src/glsl/lower_ubo_reference.cpp | 3 ---
1 file changed, 3 deletions(-)

Upstream: cgit.freedesktop.org

  • Share