gallium: fix incorrect types for shaders

diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 28a404fd01fa5a56660714de9797a61d1582ca7f..9986dc35700038978855090b1d0fa42c2741925e 100644 (file)
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -58,9 +58,8 @@ struct blit_state
    struct pipe_rasterizer_state rasterizer;
    struct pipe_sampler_state sampler;
 
-   /*struct pipe_viewport_state viewport;*/
-   struct pipe_sampler_state *vs;
-   struct pipe_sampler_state *fs;
+   void *vs;
+   void *fs;
 
    struct pipe_buffer *vbuf;  /**< quad vertices */
    float vertices[4][2][4];   /**< vertex/texcoords for quad */

diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index ed12768e7f8cc938365a537f4959df64f4b3d223..5549652abbb4bc0d2738edbe3bf1cd90155ef15f 100644 (file)
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -61,9 +61,9 @@ struct gen_mipmap_state
    struct pipe_depth_stencil_alpha_state depthstencil;
    struct pipe_rasterizer_state rasterizer;
    struct pipe_sampler_state sampler;
-   /*struct pipe_viewport_state viewport;*/
-   struct pipe_sampler_state *vs;
-   struct pipe_sampler_state *fs;
+
+   void *vs;
+   void *fs;
 
    struct pipe_buffer *vbuf;  /**< quad vertices */
    float vertices[4][2][4];   /**< vertex/texcoords for quad */