diff options
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/link_uniform_blocks.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp index 1c175ec8bdb..6ca41107e53 100644 --- a/src/glsl/link_uniform_blocks.cpp +++ b/src/glsl/link_uniform_blocks.cpp @@ -69,12 +69,15 @@ private: virtual void enter_record(const glsl_type *type, const char *name, bool row_major) { + assert(type->is_record()); this->offset = glsl_align( this->offset, type->std140_base_alignment(row_major)); } virtual void leave_record(const glsl_type *type, const char *name, bool row_major) { + assert(type->is_record()); + /* If this is the last field of a structure, apply rule #9. The * GL_ARB_uniform_buffer_object spec says: * diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index 347f079fa42..799c74bb9e6 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -546,12 +546,14 @@ private: virtual void enter_record(const glsl_type *type, const char *name, bool row_major) { + assert(type->is_record()); this->ubo_byte_offset = glsl_align( this->ubo_byte_offset, type->std140_base_alignment(row_major)); } virtual void leave_record(const glsl_type *type, const char *name, bool row_major) { + assert(type->is_record()); this->ubo_byte_offset = glsl_align( this->ubo_byte_offset, type->std140_base_alignment(row_major)); } |