summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915/i915_context.h
diff options
context:
space:
mode:
authormichal <michal@transistor.(none)>2009-12-10 07:52:45 +0100
committermichal <michal@transistor.(none)>2009-12-10 07:52:45 +0100
commit1f5285f99771243b636deb9ae0a17c54f818fac6 (patch)
treef67e41d415bcaa6d4508d47631f564a5db96253c /src/gallium/drivers/i915/i915_context.h
parent92b781c2dda9ae5aeec7e32cfc9902057edd0a9d (diff)
i915: Fix for sampler view changes.
Diffstat (limited to 'src/gallium/drivers/i915/i915_context.h')
-rw-r--r--src/gallium/drivers/i915/i915_context.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h
index da769e7b290..cd6dcd59a9f 100644
--- a/src/gallium/drivers/i915/i915_context.h
+++ b/src/gallium/drivers/i915/i915_context.h
@@ -239,14 +239,14 @@ struct i915_context
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
- struct i915_texture *texture[PIPE_MAX_SAMPLERS];
+ struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
unsigned dirty;
unsigned num_samplers;
- unsigned num_textures;
+ unsigned num_fragment_sampler_views;
unsigned num_vertex_elements;
unsigned num_vertex_buffers;
@@ -276,7 +276,7 @@ struct i915_context
#define I915_NEW_ALPHA_TEST 0x100
#define I915_NEW_DEPTH_STENCIL 0x200
#define I915_NEW_SAMPLER 0x400
-#define I915_NEW_TEXTURE 0x800
+#define I915_NEW_SAMPLER_VIEW 0x800
#define I915_NEW_CONSTANTS 0x1000
#define I915_NEW_VBO 0x2000
#define I915_NEW_VS 0x4000