r300g: add color channel masking

[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 3ca501d135641e2c60e43d8850fdf927c6939c97..3a3fd0d4f4f01f151ceaa00d975c7813d4bf02f0 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;
@@ -79,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;