Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / gallium / drivers / nv40 / nv40_state.h

diff --git a/src/gallium/drivers/nv40/nv40_state.h b/src/gallium/drivers/nv40/nv40_state.h
index 2701294a077a7e928565b518cb62a94ad361b4b0..8a9d8c8fdf608bc409f3b157f53a2edc38ba9a18 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state.h
+++ b/src/gallium/drivers/nv40/nv40_state.h
@@ -2,6 +2,7 @@
 #define __NV40_STATE_H__
 
 #include "pipe/p_state.h"
+#include "tgsi/tgsi_scan.h"
 
 struct nv40_sampler_state {
        uint32_t fmt;
@@ -23,9 +24,14 @@ struct nv40_vertex_program_data {
 };
 
 struct nv40_vertex_program {
-       const struct pipe_shader_state *pipe;
+       struct pipe_shader_state pipe;
+
+       struct draw_vertex_shader *draw;
 
        boolean translated;
+
+       struct pipe_clip_state ucp;
+
        struct nv40_vertex_program_exec *insns;
        unsigned nr_insns;
        struct nv40_vertex_program_data *consts;
@@ -39,6 +45,8 @@ struct nv40_vertex_program {
 
        uint32_t ir;
        uint32_t or;
+       uint32_t clip_ctrl;
+       struct nouveau_stateobj *so;
 };
 
 struct nv40_fragment_program_data {
@@ -47,7 +55,8 @@ struct nv40_fragment_program_data {
 };
 
 struct nv40_fragment_program {
-       const struct pipe_shader_state *pipe;
+       struct pipe_shader_state pipe;
+       struct tgsi_shader_info info;
 
        boolean translated;
        unsigned samplers;