Mesa (master): glsl: rework misleading block layout code
Timothy Arceri
tarceri at kemper.freedesktop.org
Sun Jul 23 00:06:17 UTC 2017
Module: Mesa
Branch: master
Commit: d91108b1f4265d69961df01cc0e02c1f64bccc01
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d91108b1f4265d69961df01cc0e02c1f64bccc01
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Fri Jul 21 11:42:33 2017 +1000
glsl: rework misleading block layout code
>From the ARB_uniform_buffer_object spec:
""shared" uniform blocks, the default layout, ..."
This doesn't fix anything as the default layout is already applied
at this point but fixes the misleading code/comment.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/compiler/glsl/ast_to_hir.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 7de164cebb..4916b1590a 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -7678,16 +7678,16 @@ ast_interface_block::hir(exec_list *instructions,
this->block_name);
enum glsl_interface_packing packing;
- if (this->layout.flags.q.shared) {
- packing = GLSL_INTERFACE_PACKING_SHARED;
+ if (this->layout.flags.q.std140) {
+ packing = GLSL_INTERFACE_PACKING_STD140;
} else if (this->layout.flags.q.packed) {
packing = GLSL_INTERFACE_PACKING_PACKED;
} else if (this->layout.flags.q.std430) {
packing = GLSL_INTERFACE_PACKING_STD430;
} else {
- /* The default layout is std140.
+ /* The default layout is shared.
*/
- packing = GLSL_INTERFACE_PACKING_STD140;
+ packing = GLSL_INTERFACE_PACKING_SHARED;
}
ir_variable_mode var_mode;
More information about the mesa-commit
mailing list