summaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe/i915simple
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-08-16 13:33:43 -0600
committerBrian <[email protected]>2007-08-16 13:33:43 -0600
commitde653b4c9bddcec46f3ddf411ec082dd178d7b38 (patch)
treec46350dc671e6bfc32c7a0f3df45b4d0d82c6661 /src/mesa/pipe/i915simple
parentebe510766927315ec6dcd846a980cb851b5331d4 (diff)
Begin added vertex shader state/support.
Renamed pipe_fs_state to pipe_shader_state since it can be used for both vertex and fragment shader info.
Diffstat (limited to 'src/mesa/pipe/i915simple')
-rw-r--r--src/mesa/pipe/i915simple/i915_context.h2
-rw-r--r--src/mesa/pipe/i915simple/i915_state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index d69657daa9f..1e48485c568 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -105,7 +105,7 @@ struct i915_context
struct pipe_clip_state clip;
struct pipe_depth_state depth_test;
struct pipe_framebuffer_state framebuffer;
- struct pipe_fs_state fs;
+ struct pipe_shader_state fs;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index f874b210160..06fa716c4fa 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -111,7 +111,7 @@ static void i915_set_polygon_stipple( struct pipe_context *pipe,
static void i915_set_fs_state( struct pipe_context *pipe,
- const struct pipe_fs_state *fs )
+ const struct pipe_shader_state *fs )
{
struct i915_context *i915 = i915_context(pipe);