X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fvc4%2Fvc4_qir.h;h=1aa5f652fbc2ac132ae253dd9c216f3491707493;hb=3a9e2d608563d6d305c63039396644f3b976a55d;hp=fe86232aeb27a3930a7c3af17e5d926085096323;hpb=292c24ddac5acc35676424f05291c101fcd47b3e;p=mesa.git

diff --git a/src/gallium/drivers/vc4/vc4_qir.h b/src/gallium/drivers/vc4/vc4_qir.h
index fe86232aeb2..1aa5f652fbc 100644
--- a/src/gallium/drivers/vc4/vc4_qir.h
+++ b/src/gallium/drivers/vc4/vc4_qir.h
@@ -354,7 +354,6 @@ struct vc4_fs_key {
         bool stencil_full_writemasks;
         bool is_points;
         bool is_lines;
-        bool alpha_test;
         bool point_coord_upper_left;
         bool light_twoside;
         bool msaa;
@@ -364,6 +363,7 @@ struct vc4_fs_key {
         uint8_t alpha_test_func;
         uint8_t logicop_func;
         uint32_t point_sprite_mask;
+        uint32_t ubo_1_size;
 
         struct pipe_rt_blend_state blend;
 };
@@ -461,13 +461,6 @@ struct vc4_compile {
 
         uint8_t vattr_sizes[8];
 
-        /**
-         * Order in which the vattrs were loaded by the program, to arrange
-         * vattr_offsets[] in the program data appropriately.
-         */
-        uint8_t vpm_input_order[8];
-        uint8_t next_vpm_input;
-
         /**
          * Array of the VARYING_SLOT_* of all FS QFILE_VARY reads.
          *
@@ -599,6 +592,8 @@ uint8_t qir_channels_written(struct qinst *inst);
 
 void qir_dump(struct vc4_compile *c);
 void qir_dump_inst(struct vc4_compile *c, struct qinst *inst);
+char *qir_describe_uniform(enum quniform_contents contents, uint32_t data,
+                           const uint32_t *uniforms);
 const char *qir_get_stage_name(enum qstage stage);
 
 void qir_validate(struct vc4_compile *c);