radeonsi: move struct si_compute into a header

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 15ae977147704feaedd053a9d11095f9829382d7..b4e7fce71e99b9de300b72e1cac9977119a34a78 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -2,6 +2,7 @@ C_SOURCES := \
        cik_sdma.c \
        si_blit.c \
        si_compute.c \
+       si_compute.h \
        si_cp_dma.c \
        si_debug.c \
        si_descriptors.c \

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 382e5a1cd89fa5c37434aac890d69cb3730c9591..3a519a72d59ca14f0048ffb5bd3ced3070764bf6 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -29,29 +29,9 @@
 #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;

diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
new file mode 100644 (file)
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 */