gallium: notify drivers about possible changes in user buffer contents

[mesa.git] / src / gallium / drivers / nvc0 / nvc0_stateobj.h

diff --git a/src/gallium/drivers/nvc0/nvc0_stateobj.h b/src/gallium/drivers/nvc0/nvc0_stateobj.h
index 67674d4093fa69d0ad086a76fb3bfc3c73162744..752e927e2aa62003499afbee26e4eaca39f76851 100644 (file)
--- a/src/gallium/drivers/nvc0/nvc0_stateobj.h
+++ b/src/gallium/drivers/nvc0/nvc0_stateobj.h
@@ -10,7 +10,7 @@
    (so)->state[(so)->size++] =                                                 \
       (0x2 << 28) | ((s) << 16) | (NVC0_SUBCH_3D << 13) | ((NVC0_3D_##m) >> 2)
 
-#define SB_OUT_3D(so, m, d)                                                    \
+#define SB_IMMED_3D(so, m, d)                                                  \
    (so)->state[(so)->size++] =                                                 \
       (0x8 << 28) | ((d) << 16) | (NVC0_SUBCH_3D << 13) | ((NVC0_3D_##m) >> 2)
 
@@ -48,7 +48,7 @@ nvc0_tic_entry(struct pipe_sampler_view *view)
 struct nvc0_rasterizer_stateobj {
    struct pipe_rasterizer_state pipe;
    int size;
-   uint32_t state[43];
+   uint32_t state[36];
 };
 
 struct nvc0_zsa_stateobj {
@@ -65,17 +65,18 @@ struct nvc0_vertex_element {
 struct nvc0_vertex_stateobj {
    struct translate *translate;
    unsigned num_elements;
-   uint32_t instance_bits;
+   uint32_t instance_elts;
+   uint32_t instance_bufs;
    unsigned vtx_size;
    unsigned vtx_per_packet_max;
-   struct nvc0_vertex_element element[1];
+   struct nvc0_vertex_element element[0];
 };
 
 /* will have to lookup index -> location qualifier from nvc0_program */
-struct nvc0_tfb_state {
-   uint8_t varying_count[4];
+struct nvc0_transform_feedback_state {
    uint32_t stride[4];
-   uint8_t varying_indices[1];
+   uint8_t varying_count[4];
+   uint8_t varying_index[0];
 };
 
 #endif