diff options
author | Timothy Arceri <[email protected]> | 2017-08-01 17:35:06 +1000 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-08-15 08:20:57 +1000 |
commit | 365d34540f331df57780dddf8da87235be0a6bcb (patch) | |
tree | 948a12d4084a0cbb5c5a3fc5a48671b705453c36 | |
parent | 1efd73df39b39589d26f44d4927d2c65697bbe6e (diff) |
mesa: correctly calculate the storage offset for i915
When generating the storage offset for struct members we need
to skip opaque types as they no longer have backing storage.
Fixes: fcbb93e86024 ("mesa: stop assigning unused storage for non-bindless opaque types")
V2: simplify since bindless will never be supported in this code
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101983
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index e141ac4b715..87999ea3178 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -550,10 +550,8 @@ type_size(const struct glsl_type *type) return size; case GLSL_TYPE_SAMPLER: case GLSL_TYPE_IMAGE: + return 0; case GLSL_TYPE_SUBROUTINE: - /* Samplers take up one slot in UNIFORMS[], but they're baked in - * at link time. - */ return 1; case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_VOID: |