diff options
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/glsl_types.cpp | 7 | ||||
| -rw-r--r-- | src/compiler/glsl_types.h | 7 |
4 files changed, 17 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 673ce8f716f..15001b768cb 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -6955,6 +6955,8 @@ ast_interface_block::hir(exec_list *instructions, earlier_per_vertex->fields.structure[j].patch; fields[i].precision = earlier_per_vertex->fields.structure[j].precision; + fields[i].explicit_xfb_buffer = + earlier_per_vertex->fields.structure[j].explicit_xfb_buffer; } } diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 24e0b1a3667..76a22cee29c 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -334,6 +334,7 @@ per_vertex_accumulator::add_field(int slot, const glsl_type *type, this->fields[this->num_fields].image_coherent = 0; this->fields[this->num_fields].image_volatile = 0; this->fields[this->num_fields].image_restrict = 0; + this->fields[this->num_fields].explicit_xfb_buffer = 0; this->fields[this->num_fields].xfb_buffer = -1; this->fields[this->num_fields].xfb_stride = -1; this->num_fields++; diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 3b77b5e690f..c6a742e3aaf 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -132,6 +132,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, this->fields.structure[i].image_volatile = fields[i].image_volatile; this->fields.structure[i].image_restrict = fields[i].image_restrict; this->fields.structure[i].precision = fields[i].precision; + this->fields.structure[i].explicit_xfb_buffer = + fields[i].explicit_xfb_buffer; this->fields.structure[i].xfb_buffer = fields[i].xfb_buffer; this->fields.structure[i].xfb_stride = fields[i].xfb_stride; } @@ -174,6 +176,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, this->fields.structure[i].image_volatile = fields[i].image_volatile; this->fields.structure[i].image_restrict = fields[i].image_restrict; this->fields.structure[i].precision = fields[i].precision; + this->fields.structure[i].explicit_xfb_buffer = + fields[i].explicit_xfb_buffer; this->fields.structure[i].xfb_buffer = fields[i].xfb_buffer; this->fields.structure[i].xfb_stride = fields[i].xfb_stride; } @@ -919,6 +923,9 @@ glsl_type::record_compare(const glsl_type *b) const if (this->fields.structure[i].precision != b->fields.structure[i].precision) return false; + if (this->fields.structure[i].explicit_xfb_buffer + != b->fields.structure[i].explicit_xfb_buffer) + return false; if (this->fields.structure[i].xfb_buffer != b->fields.structure[i].xfb_buffer) return false; diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h index 9b5f8b1290b..4f4cfea1201 100644 --- a/src/compiler/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -901,6 +901,13 @@ struct glsl_struct_field { unsigned image_volatile:1; unsigned image_restrict:1; + /** + * Any of the xfb_* qualifiers trigger the shader to be in transform + * feedback mode so we need to keep track of whether the buffer was + * explicitly set or if its just been assigned the default global value. + */ + unsigned explicit_xfb_buffer:1; + #ifdef __cplusplus glsl_struct_field(const struct glsl_type *_type, const char *_name) : type(_type), name(_name), location(-1), interpolation(0), centroid(0), |