summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-03-27 15:35:25 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-27 15:43:32 -0600
commitba49fa39f3028d1ee44a999d84b29a0cfbfab0bd (patch)
tree8c2eda6116f4fb12131ae6d828842033bdb1e9fb
parentdf1744c0433f3f73ebf4b06567fefa946a29c3d8 (diff)
gallium: fix incorrect types for shaders
-rw-r--r--src/gallium/auxiliary/util/u_blit.c5
-rw-r--r--src/gallium/auxiliary/util/u_gen_mipmap.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 28a404fd01..9986dc3570 100644
--- 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 ed12768e7f..5549652abb 100644
--- 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 */