summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_context.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-02-29 16:16:16 -0700
committerBrian Paul <[email protected]>2008-02-29 16:16:16 -0700
commit07d6347e8a51fc7bbd5c586a5739f17c68c5eafd (patch)
treeec2ba34d12827a1ea5078c35aea59c4148f34aff /src/mesa/state_tracker/st_context.h
parentc8bca8d8a94b7bce532b40fd5c422063632b26c4 (diff)
gallium: change st->state.sampler_texture[] to store pipe_texture pointers
This is a better fix for the previous check-in. Fixes texadd.c conform test, and probably other bugs.
Diffstat (limited to 'src/mesa/state_tracker/st_context.h')
-rw-r--r--src/mesa/state_tracker/st_context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 5be4769be43..1fbf9721e79 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -86,7 +86,7 @@ struct st_context
struct pipe_clip_state clip;
struct pipe_constant_buffer constants[2];
struct pipe_framebuffer_state framebuffer;
- struct st_texture_object *sampler_texture[PIPE_MAX_SAMPLERS];
+ struct pipe_texture *sampler_texture[PIPE_MAX_SAMPLERS];
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_viewport_state viewport;