[Mesa-dev] [PATCH 08/11] radeonsi: move struct si_compute into a header

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haehnle at amd.com>

---
 src/gallium/drivers/radeonsi/Makefile.sources |  1 +
 src/gallium/drivers/radeonsi/si_compute.c     | 22 +-----------
 src/gallium/drivers/radeonsi/si_compute.h     | 50 +++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 src/gallium/drivers/radeonsi/si_compute.h

diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 15ae977..b4e7fce 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -1,14 +1,15 @@
 C_SOURCES := \
 	cik_sdma.c \
 	si_blit.c \
 	si_compute.c \
+	si_compute.h \
 	si_cp_dma.c \
 	si_debug.c \
 	si_descriptors.c \
 	si_dma.c \
 	si_hw_context.c \
 	si_pipe.c \
 	si_pipe.h \
 	si_pm4.c \
 	si_pm4.h \
 	si_perfcounter.c \
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 382e5a1..3a519a72 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -22,43 +22,23 @@
  *
  */
 
 #include "tgsi/tgsi_parse.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 
 #include "amd_kernel_code_t.h"
 #include "radeon/r600_cs.h"
 #include "si_pipe.h"
+#include "si_compute.h"
 #include "sid.h"
 
-#define MAX_GLOBAL_BUFFERS 22
-
-struct si_compute {
-	struct si_screen *screen;
-	struct tgsi_token *tokens;
-	struct util_queue_fence ready;
-	struct si_compiler_ctx_state compiler_ctx_state;
-
-	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 variable_group_size : 1;
-	unsigned uses_grid_size:1;
-	unsigned uses_block_size:1;
-};
-
 struct dispatch_packet {
 	uint16_t header;
 	uint16_t setup;
 	uint16_t workgroup_size_x;
 	uint16_t workgroup_size_y;
 	uint16_t workgroup_size_z;
 	uint16_t reserved0;
 	uint32_t grid_size_x;
 	uint32_t grid_size_y;
 	uint32_t grid_size_z;
diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
new file mode 100644
index 0000000..ed33104
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/si_compute.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2017 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef SI_COMPUTE_H
+#define SI_COMPUTE_H
+
+#include "si_shader.h"
+
+#define MAX_GLOBAL_BUFFERS 22
+
+struct si_compute {
+	struct si_screen *screen;
+	struct tgsi_token *tokens;
+	struct util_queue_fence ready;
+	struct si_compiler_ctx_state compiler_ctx_state;
+
+	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 variable_group_size : 1;
+	unsigned uses_grid_size:1;
+	unsigned uses_block_size:1;
+};
+
+#endif /* SI_COMPUTE_H */
-- 
2.9.3