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 57566128ab5ab8fbe423bb336b119e80cf119a52..b508000bdabd02ccfe63638495e855acf4cc6b37 100644 (file)
--- a/src/gallium/drivers/nvc0/nvc0_stateobj.h
+++ b/src/gallium/drivers/nvc0/nvc0_stateobj.h
@@ -14,45 +14,24 @@
 
 #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[36];
+   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 {