diff options
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 10 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 14 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index e76544a2c4c..b73e6205905 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -4136,6 +4136,16 @@ ast_uniform_block::hir(exec_list *instructions, "the current scope.\n", ubo->Name); } + if (this->layout.flags.q.shared) { + ubo->_Packing = ubo_packing_shared; + } else if (this->layout.flags.q.packed) { + ubo->_Packing = ubo_packing_packed; + } else { + /* The default layout is std140. + */ + ubo->_Packing = ubo_packing_std140; + } + unsigned int num_variables = 0; foreach_list_typed(ast_declarator_list, decl_list, link, &declarations) { foreach_list_const(node, &decl_list->declarations) { diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d37e6c4c04d..4c7cc6099ca 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2278,6 +2278,12 @@ struct gl_uniform_buffer_variable GLboolean RowMajor; }; +enum gl_uniform_block_packing { + ubo_packing_std140, + ubo_packing_shared, + ubo_packing_packed +}; + struct gl_uniform_block { /** Declared name of the uniform block */ @@ -2299,6 +2305,14 @@ struct gl_uniform_block * (GL_UNIFORM_BLOCK_DATA_SIZE). */ GLuint UniformBufferSize; + + /** + * Layout specified in the shader + * + * This isn't accessible through the API, but it is used while + * cross-validating uniform blocks. + */ + enum gl_uniform_block_packing _Packing; }; /** |