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

glsl: simply packing class comparison

Browse Source 
Handle comparing the packing class using the same method as we do
for var->data.is_xfb_only

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Brian Paul
2017-12-15 15:21:46 -07:00
parent 06588a065f
commit 462df64495
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/glsl/link_varyings.cpp
View File

@@ -1775,6 +1775,7 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
unsigned generic_location = 0; unsigned generic_location = 0;
unsigned generic_patch_location = MAX_VARYING*4; unsigned generic_patch_location = MAX_VARYING*4;
bool previous_var_xfb_only = false; bool previous_var_xfb_only = false;
unsigned previous_packing_class = ~0u;
for (unsigned i = 0; i < this->num_matches; i++) { for (unsigned i = 0; i < this->num_matches; i++) {
unsigned *location = &generic_location; unsigned *location = &generic_location;
@@ -1809,12 +1810,12 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
if (var->data.must_be_shader_input || if (var->data.must_be_shader_input ||
(this->disable_varying_packing && (this->disable_varying_packing &&
!(previous_var_xfb_only && var->data.is_xfb_only)) || !(previous_var_xfb_only && var->data.is_xfb_only)) ||
(i > 0 && this->matches[i - 1].packing_class (previous_packing_class != this->matches[i].packing_class )) {
!= this->matches[i].packing_class )) {
*location = ALIGN(*location, 4); *location = ALIGN(*location, 4);
} }
previous_var_xfb_only = var->data.is_xfb_only; previous_var_xfb_only = var->data.is_xfb_only;
previous_packing_class = this->matches[i].packing_class;
/* The number of components taken up by this variable. For vertex shader /* The number of components taken up by this variable. For vertex shader
* inputs, we use the number of slots * 4, as they have different * inputs, we use the number of slots * 4, as they have different