nv50: report some supported formats to keep the state tracker from asserting.

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

diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
index 61eb4e6a937fce18a04f3d19ea1e4d1d5a9845fe..1b794c1872436e1895816fd0abab0b111b1b8d32 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_context.h
+++ b/src/gallium/drivers/nv10/nv10_context.h
@@ -21,17 +21,16 @@
 #define NOUVEAU_MSG(fmt, args...) \
        fprintf(stderr, "nouveau: "fmt, ##args);
 
-#define NV10_NEW_VERTPROG      (1 << 1)
-#define NV10_NEW_FRAGPROG      (1 << 2)
-#define NV10_NEW_ARRAYS                (1 << 3)
-#define NV10_NEW_VTXFMT                (1 << 4)
-#define NV10_NEW_BLEND         (1 << 5)
-#define NV10_NEW_BLENDCOL      (1 << 6)
-#define NV10_NEW_RAST          (1 << 7)
-#define NV10_NEW_DSA           (1 << 8)
-#define NV10_NEW_VIEWPORT      (1 << 9)
-#define NV10_NEW_SCISSOR       (1 << 9)
-#define NV10_NEW_FRAMEBUFFER   (1 << 10)
+#define NV10_NEW_VERTPROG      (1 << 0)
+#define NV10_NEW_FRAGPROG      (1 << 1)
+#define NV10_NEW_VTXARRAYS     (1 << 2)
+#define NV10_NEW_BLEND         (1 << 3)
+#define NV10_NEW_BLENDCOL      (1 << 4)
+#define NV10_NEW_RAST          (1 << 5)
+#define NV10_NEW_DSA           (1 << 6)
+#define NV10_NEW_VIEWPORT      (1 << 7)
+#define NV10_NEW_SCISSOR       (1 << 8)
+#define NV10_NEW_FRAMEBUFFER   (1 << 9)
 
 #include "nv10_screen.h"
 
@@ -67,6 +66,11 @@ struct nv10_context {
        struct pipe_scissor_state *scissor;
        struct pipe_framebuffer_state *framebuffer;
 
+       //struct pipe_buffer *constbuf[PIPE_SHADER_TYPES];
+       float *constbuf[PIPE_SHADER_TYPES][32][4];
+
+       struct vertex_info vertex_info;
+
        struct {
                struct pipe_buffer *buffer;
                uint32_t format;
@@ -78,8 +82,7 @@ struct nv10_context {
                unsigned delta;
        } vb[16];
 
-       struct vertex_info vertex_info;
-       struct {
+/*     struct {
        
                struct nouveau_resource *exec_heap;
                struct nouveau_resource *data_heap;
@@ -87,9 +90,8 @@ struct nv10_context {
                struct nv10_vertex_program *active;
 
                struct nv10_vertex_program *current;
-               struct pipe_buffer *constant_buf;
        } vertprog;
-
+*/
        struct {
                struct nv10_fragment_program *active;
 
@@ -97,8 +99,8 @@ struct nv10_context {
                struct pipe_buffer *constant_buf;
        } fragprog;
 
-       struct pipe_vertex_buffer  vtxbuf[PIPE_ATTRIB_MAX];
-       struct pipe_vertex_element vtxelt[PIPE_ATTRIB_MAX];
+       struct pipe_vertex_buffer  vtxbuf[PIPE_MAX_ATTRIBS];
+       struct pipe_vertex_element vtxelt[PIPE_MAX_ATTRIBS];
 };
 
 static INLINE struct nv10_context *