gallium: remove PIPE_CAP_GLSL and enable GLSL unconditionally

[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..b508000bdabd02ccfe63638495e855acf4cc6b37 100644 (file)
--- a/src/gallium/drivers/nvc0/nvc0_stateobj.h
+++ b/src/gallium/drivers/nvc0/nvc0_stateobj.h
@@ -4,57 +4,34 @@
 
 #include "pipe/p_state.h"
 
-#define NVC0_SCISSORS_CLIPPING
-
 #define SB_BEGIN_3D(so, m, s)                                                  \
    (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)
 
 #define SB_DATA(so, u) (so)->state[(so)->size++] = (u)
 
+#include "nv50/nv50_stateobj_tex.h"
+
 struct nvc0_blend_stateobj {
    struct pipe_blend_state pipe;
    int size;
    uint32_t state[72];
 };
 
-struct nvc0_tsc_entry {
-   int id;
-   uint32_t tsc[8];
-};
-
-static INLINE struct nvc0_tsc_entry *
-nvc0_tsc_entry(void *hwcso)
-{
-   return (struct nvc0_tsc_entry *)hwcso;
-}
-
-struct nvc0_tic_entry {
-   struct pipe_sampler_view pipe;
-   int id;
-   uint32_t tic[8];
-};
-
-static INLINE struct nvc0_tic_entry *
-nvc0_tic_entry(struct pipe_sampler_view *view)
-{
-   return (struct nvc0_tic_entry *)view;
-}
-
 struct nvc0_rasterizer_stateobj {
    struct pipe_rasterizer_state pipe;
    int size;
-   uint32_t state[43];
+   uint32_t state[41];
 };
 
 struct nvc0_zsa_stateobj {
    struct pipe_depth_stencil_alpha_state pipe;
    int size;
-   uint32_t state[29];
+   uint32_t state[26];
 };
 
 struct nvc0_vertex_element {
@@ -65,17 +42,19 @@ 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;
+   boolean need_conversion; /* e.g. VFETCH cannot convert f64 to f32 */
    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