OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: rework misleading block layout code

Browse Source 
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@gmail.com>
This commit is contained in:
Timothy Arceri
2017-07-21 11:42:33 +10:00
parent 316b4c9ada
commit d91108b1f4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -7678,16 +7678,16 @@ ast_interface_block::hir(exec_list *instructions,
this->block_name); this->block_name);
enum glsl_interface_packing packing; enum glsl_interface_packing packing;
if (this->layout.flags.q.shared) { if (this->layout.flags.q.std140) {
packing = GLSL_INTERFACE_PACKING_SHARED; packing = GLSL_INTERFACE_PACKING_STD140;
} else if (this->layout.flags.q.packed) { } else if (this->layout.flags.q.packed) {
packing = GLSL_INTERFACE_PACKING_PACKED; packing = GLSL_INTERFACE_PACKING_PACKED;
} else if (this->layout.flags.q.std430) { } else if (this->layout.flags.q.std430) {
packing = GLSL_INTERFACE_PACKING_STD430; packing = GLSL_INTERFACE_PACKING_STD430;
} else { } 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; ir_variable_mode var_mode;