radeonsi: reduce type sizes in si_shader_selector

[mesa.git] / src / gallium / drivers / radeonsi / si_compute.h

diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
index c19b701fc710a9ce222aad49047a6106f9fcc523..7cf0627185327bec8ef862b35f36db6b2d004cff 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.h
+++ b/src/gallium/drivers/radeonsi/si_compute.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2017 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,47 +25,33 @@
 #ifndef SI_COMPUTE_H
 #define SI_COMPUTE_H
 
-#include "util/u_inlines.h"
-
 #include "si_shader.h"
-
-#define MAX_GLOBAL_BUFFERS 22
+#include "util/u_inlines.h"
 
 struct si_compute {
-       struct pipe_reference reference;
-       struct si_screen *screen;
-       struct tgsi_token *tokens;
-       struct util_queue_fence ready;
-       struct si_compiler_ctx_state compiler_ctx_state;
+   struct si_shader_selector sel;
+   struct si_shader shader;
 
-       /* bitmasks of used descriptor slots */
-       uint32_t active_const_and_shader_buffers;
-       uint64_t active_samplers_and_images;
+   unsigned ir_type;
+   unsigned local_size;
+   unsigned private_size;
+   unsigned input_size;
 
-       unsigned ir_type;
-       unsigned local_size;
-       unsigned private_size;
-       unsigned input_size;
-       struct si_shader shader;
+   int max_global_buffers;
+   struct pipe_resource **global_buffers;
 
-       struct pipe_resource *global_buffers[MAX_GLOBAL_BUFFERS];
-       unsigned use_code_object_v2 : 1;
-       unsigned variable_group_size : 1;
-       unsigned uses_grid_size:1;
-       unsigned uses_block_size:1;
-       unsigned uses_bindless_samplers:1;
-       unsigned uses_bindless_images:1;
+   bool reads_variable_block_size;
+   unsigned num_cs_user_data_dwords;
 };
 
 void si_destroy_compute(struct si_compute *program);
 
-static inline void
-si_compute_reference(struct si_compute **dst, struct si_compute *src)
+static inline void si_compute_reference(struct si_compute **dst, struct si_compute *src)
 {
-       if (pipe_reference(&(*dst)->reference, &src->reference))
-               si_destroy_compute(*dst);
+   if (pipe_reference(&(*dst)->sel.base.reference, &src->sel.base.reference))
+      si_destroy_compute(*dst);
 
-       *dst = src;
+   *dst = src;
 }
 
 #endif /* SI_COMPUTE_H */