glsl: remove ir_state_slot::swizzle

Same story as with the NIR counterpart in the previous commit.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22620>

diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp
index 4aed31d..7af97dc 100644 (file)
--- a/src/compiler/glsl/builtin_variables.cpp
+++ b/src/compiler/glsl/builtin_variables.cpp
@@ -683,7 +683,6 @@ builtin_variable_generator::add_uniform(const glsl_type *type,
         if (type->is_array())
             slots->tokens[1] = a;
 
-        slots->swizzle = element->swizzle;
         slots++;
       }
    }

diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index c1c5f36..38ede7e 100644 (file)
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -394,7 +394,6 @@ depth_layout_string(ir_depth_layout layout);
  */
 struct ir_state_slot {
    gl_state_index16 tokens[STATE_LENGTH];
-   int swizzle;
 };
 
 

diff --git a/src/compiler/glsl/lower_blend_equation_advanced.cpp b/src/compiler/glsl/lower_blend_equation_advanced.cpp
index 7eebffd..86ad6e2 100644 (file)
--- a/src/compiler/glsl/lower_blend_equation_advanced.cpp
+++ b/src/compiler/glsl/lower_blend_equation_advanced.cpp
@@ -490,7 +490,6 @@ lower_blend_equation_advanced(struct gl_linked_shader *sh, bool coherent)
    mode->data.how_declared = ir_var_hidden;
    mode->allocate_state_slots(1);
    ir_state_slot *slot0 = &mode->get_state_slots()[0];
-   slot0->swizzle = SWIZZLE_XXXX;
    slot0->tokens[0] = STATE_ADVANCED_BLENDING_MODE;
    for (int i = 1; i < STATE_LENGTH; i++)
       slot0->tokens[i] = 0;