nv50: rename nv50_state.h to nv50_program.h

diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 69c9dba675b056760788e93235abba3cf9e73747..72d859c468589ea730019e870e0d923bc9cc067e 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -15,8 +15,8 @@
        struct nv50_screen *ctx = nv50->screen
 #include "nouveau/nouveau_push.h"
 
-#include "nv50_state.h"
 #include "nv50_screen.h"
+#include "nv50_program.h"
 
 #define NOUVEAU_ERR(fmt, args...) \
        fprintf(stderr, "%s:%d -  "fmt, __func__, __LINE__, ##args);

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index b73003123d80817bf7123dfbb0ba70f0c6e6b2a0..2118d8ef85f4e2ff47bd81d112cf57f51acccffd 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -8,7 +8,6 @@
 #include "tgsi/util/tgsi_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 #define NV50_SU_MAX_TEMP 64
 

diff --git a/src/gallium/drivers/nv50/nv50_program.h b/src/gallium/drivers/nv50/nv50_program.h
new file mode 100644 (file)
index 0000000..dd5aed7
--- /dev/null
+++ b/src/gallium/drivers/nv50/nv50_program.h
@@ -0,0 +1,37 @@
+#ifndef __NV50_PROGRAM_H__
+#define __NV50_PROGRAM_H__
+
+#include "pipe/p_state.h"
+#include "tgsi/util/tgsi_scan.h"
+
+struct nv50_program_data {
+       int index;
+       int component;
+       float value;
+};
+
+struct nv50_program {
+       struct pipe_shader_state pipe;
+       struct tgsi_shader_info info;
+       boolean translated;
+
+       unsigned type;
+       unsigned *insns;
+       unsigned insns_nr;
+
+       struct pipe_buffer *buffer;
+
+       float *immd;
+       unsigned immd_nr;
+
+       struct nouveau_resource *data;
+
+       struct {
+               unsigned high_temp;
+               struct {
+                       unsigned attr[2];
+               } vp;
+       } cfg;
+};
+
+#endif

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 774117326adc9869f95bb5fd4f534e69c78c5c50..ed6cca9a0ddc685e5a29f63ddc81782d0adfcf7c 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 #include "nouveau/nouveau_stateobj.h"
 

diff --git a/src/gallium/drivers/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_state.h
deleted file mode 100644 (file)
index d568bf6..0000000
--- a/src/gallium/drivers/nv50/nv50_state.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __NV50_STATE_H__
-#define __NV50_STATE_H__
-
-#include "pipe/p_state.h"
-#include "tgsi/util/tgsi_scan.h"
-
-struct nv50_program_data {
-       int index;
-       int component;
-       float value;
-};
-
-struct nv50_program {
-       struct pipe_shader_state pipe;
-       struct tgsi_shader_info info;
-       boolean translated;
-
-       unsigned type;
-       unsigned *insns;
-       unsigned insns_nr;
-
-       struct pipe_buffer *buffer;
-
-       float *immd;
-       unsigned immd_nr;
-
-       struct nouveau_resource *data;
-
-       struct {
-               unsigned high_temp;
-               struct {
-                       unsigned attr[2];
-               } vp;
-       } cfg;
-};
-
-#endif

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index badbef53df59aef3efdea295128118ce54329d6c..140d60cc9a677da4f51b253b4d06095abc94f187 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -3,7 +3,6 @@
 #include "pipe/p_util.h"
 
 #include "nv50_context.h"
-#include "nv50_state.h"
 
 static INLINE unsigned
 nv50_prim(unsigned mode)