Merge branch 'mesa_7_7_branch'

[mesa.git] / src / gallium / drivers / nv10 / nv10_state.h

diff --git a/src/gallium/drivers/nv10/nv10_state.h b/src/gallium/drivers/nv10/nv10_state.h
index 9bda8a7d6a39446b3371d195ad45f2843d810fae..2524ac02e29d95bb39cbc4879eb894a84e18456c 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_state.h
+++ b/src/gallium/drivers/nv10/nv10_state.h
@@ -2,7 +2,7 @@
 #define __NV10_STATE_H__
 
 #include "pipe/p_state.h"
-#include "tgsi/util/tgsi_scan.h"
+#include "tgsi/tgsi_scan.h"
 
 struct nv10_blend_state {
        uint32_t b_enable;
@@ -39,6 +39,8 @@ struct nv10_rasterizer_state {
        uint32_t cull_face_en;
 
        uint32_t point_sprite;
+
+       const struct pipe_rasterizer_state *templ;
 };
 
 struct nv10_vertex_program_exec {
@@ -77,7 +79,7 @@ struct nv10_fragment_program_data {
 };
 
 struct nv10_fragment_program {
-       const struct pipe_shader_state *pipe;
+       struct pipe_shader_state pipe;
        struct tgsi_shader_info info;
 
        boolean translated;
@@ -124,6 +126,7 @@ struct nv10_depth_stencil_alpha_state {
 
 struct nv10_miptree {
        struct pipe_texture base;
+       struct nouveau_bo *bo;
 
        struct pipe_buffer *buffer;
        uint total_size;