Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
[mesa.git] / src / gallium / drivers / nv40 / nv40_state.h
index e018464c9f8431ad0e2e1e45f26621f94ff2f351..8a9d8c8fdf608bc409f3b157f53a2edc38ba9a18 100644 (file)
@@ -2,7 +2,7 @@
 #define __NV40_STATE_H__
 
 #include "pipe/p_state.h"
-#include "tgsi/util/tgsi_scan.h"
+#include "tgsi/tgsi_scan.h"
 
 struct nv40_sampler_state {
        uint32_t fmt;
@@ -29,6 +29,9 @@ struct nv40_vertex_program {
        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;