summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-10-12 18:30:51 +0200
committerMarek Olšák <[email protected]>2012-10-12 19:00:30 +0200
commit555c8d500a4a09445a892316610a428d408318ed (patch)
tree65c6659f19ba35a6a3249b683825bd01501d2664 /src/gallium
parent23c6b8f2edc42a483148c3d7357331bccf1edd11 (diff)
r600g: move shader structures into r600_shader.h
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/eg_asm.c1
-rw-r--r--src/gallium/drivers/r600/evergreen_state.c1
-rw-r--r--src/gallium/drivers/r600/r600_asm.c1
-rw-r--r--src/gallium/drivers/r600/r600_asm.h4
-rw-r--r--src/gallium/drivers/r600/r600_pipe.h24
-rw-r--r--src/gallium/drivers/r600/r600_shader.c1
-rw-r--r--src/gallium/drivers/r600/r600_shader.h21
-rw-r--r--src/gallium/drivers/r600/r600_state.c1
-rw-r--r--src/gallium/drivers/r600/r600_state_common.c1
9 files changed, 30 insertions, 25 deletions
diff --git a/src/gallium/drivers/r600/eg_asm.c b/src/gallium/drivers/r600/eg_asm.c
index 00ac4a8c25b..310d4242574 100644
--- a/src/gallium/drivers/r600/eg_asm.c
+++ b/src/gallium/drivers/r600/eg_asm.c
@@ -22,6 +22,7 @@
*/
#include "r600_pipe.h"
#include "r600_opcodes.h"
+#include "r600_shader.h"
#include "util/u_memory.h"
#include "eg_sq.h"
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 37f139274e8..330c0212a18 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -21,6 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_formats.h"
+#include "r600_shader.h"
#include "evergreend.h"
#include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 37e8bf002d4..066fb67aba4 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -23,6 +23,7 @@
#include "r600_sq.h"
#include "r600_opcodes.h"
#include "r600_formats.h"
+#include "r600_shader.h"
#include "r600d.h"
#include <errno.h>
diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index d8f258fb10a..8a9f3189be0 100644
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -23,9 +23,7 @@
#ifndef R600_ASM_H
#define R600_ASM_H
-#include "r600.h"
-
-struct r600_context;
+#include "r600_pipe.h"
struct r600_bytecode_alu_src {
unsigned sel;
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index bf3d0bd778d..578cbbe57d9 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -31,7 +31,6 @@
#include "r600.h"
#include "r600_llvm.h"
#include "r600_public.h"
-#include "r600_shader.h"
#include "r600_resource.h"
#include "evergreen_compute.h"
@@ -46,6 +45,8 @@
#define R600_BIG_ENDIAN 0
#endif
+struct r600_shader_key;
+
/* This encapsulates a state or an operation which can emitted into the GPU
* command stream. It's not limited to states only, it can be used for anything
* that wants to write commands into the CS (e.g. cache flushes). */
@@ -261,27 +262,6 @@ struct r600_pipe_shader_selector {
unsigned nr_ps_max_color_exports;
};
-struct r600_shader_key {
- unsigned color_two_side:1;
- unsigned alpha_to_one:1;
- unsigned nr_cbufs:4;
-};
-
-struct r600_pipe_shader {
- struct r600_pipe_shader_selector *selector;
- struct r600_pipe_shader *next_variant;
- struct r600_shader shader;
- struct r600_pipe_state rstate;
- struct r600_resource *bo;
- unsigned sprite_coord_enable;
- unsigned flatshade;
- unsigned pa_cl_vs_out_cntl;
- unsigned nr_ps_color_outputs;
- struct r600_shader_key key;
- unsigned db_shader_control;
- unsigned ps_depth_export;
-};
-
struct r600_pipe_sampler_state {
uint32_t tex_sampler_words[3];
uint32_t border_color[4];
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 0b45d4f6e01..053a9882f9c 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -24,6 +24,7 @@
#include "r600_llvm.h"
#include "r600_formats.h"
#include "r600_opcodes.h"
+#include "r600_shader.h"
#include "r600d.h"
#include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/drivers/r600/r600_shader.h b/src/gallium/drivers/r600/r600_shader.h
index 2b8412aa80f..f76d5915281 100644
--- a/src/gallium/drivers/r600/r600_shader.h
+++ b/src/gallium/drivers/r600/r600_shader.h
@@ -62,4 +62,25 @@ struct r600_shader {
boolean vs_out_point_size;
};
+struct r600_shader_key {
+ unsigned color_two_side:1;
+ unsigned alpha_to_one:1;
+ unsigned nr_cbufs:4;
+};
+
+struct r600_pipe_shader {
+ struct r600_pipe_shader_selector *selector;
+ struct r600_pipe_shader *next_variant;
+ struct r600_shader shader;
+ struct r600_pipe_state rstate;
+ struct r600_resource *bo;
+ unsigned sprite_coord_enable;
+ unsigned flatshade;
+ unsigned pa_cl_vs_out_cntl;
+ unsigned nr_ps_color_outputs;
+ struct r600_shader_key key;
+ unsigned db_shader_control;
+ unsigned ps_depth_export;
+};
+
#endif
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 208973affd2..7ae45584a15 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -21,6 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_formats.h"
+#include "r600_shader.h"
#include "r600d.h"
#include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 8b8e34dc9aa..ef18f6bcea2 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -25,6 +25,7 @@
* Jerome Glisse <[email protected]>
*/
#include "r600_formats.h"
+#include "r600_shader.h"
#include "r600d.h"
#include "util/u_draw_quad.h"