radeonsi: add si_shader_selector into si_compute

Now we can assume that shader->selector is always set.
This will simplify some code.

Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Acked-by: Samuel Pitoiset <[email protected]>

1 files changed, 3 insertions, 17 deletions

diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
index 57c0bde4aca..e0b74397843 100644
--- a/src/gallium/drivers/radeonsi/si_compute.h
+++ b/src/gallium/drivers/radeonsi/si_compute.h
@@ -32,30 +32,16 @@
 #define MAX_GLOBAL_BUFFERS 32
 
 struct si_compute {
-	struct pipe_reference reference;
-	struct si_screen *screen;
-	union {
-		struct tgsi_token *tgsi;
-		struct nir_shader *nir;
-	} ir;
-	struct util_queue_fence ready;
-	struct si_compiler_ctx_state compiler_ctx_state;
-
-	/* bitmasks of used descriptor slots */
-	uint32_t active_const_and_shader_buffers;
-	uint64_t active_samplers_and_images;
+	struct si_shader_selector sel;
+	struct si_shader shader;
 
 	unsigned ir_type;
 	unsigned local_size;
 	unsigned private_size;
 	unsigned input_size;
-	struct si_shader shader;
 
 	struct pipe_resource *global_buffers[MAX_GLOBAL_BUFFERS];
 	unsigned use_code_object_v2 : 1;
-	unsigned uses_grid_size:1;
-	unsigned uses_bindless_samplers:1;
-	unsigned uses_bindless_images:1;
 	bool reads_variable_block_size;
 	unsigned num_cs_user_data_dwords;
 };
@@ -65,7 +51,7 @@ void si_destroy_compute(struct si_compute *program);
 static inline void
 si_compute_reference(struct si_compute **dst, struct si_compute *src)
 {
-	if (pipe_reference(&(*dst)->reference, &src->reference))
+	if (pipe_reference(&(*dst)->sel.reference, &src->sel.reference))
 		si_destroy_compute(*dst);
 
 	*dst = src;