i915: handle NULL object in i915_bind_rasterizer_state()

This commit is contained in:
Brian 2008-03-12 16:56:12 -06:00
parent d1284d3be2
commit 2109ba4c5d
1 changed files with 6 additions and 5 deletions

View File

@ -668,22 +668,23 @@ i915_create_rasterizer_state(struct pipe_context *pipe,
} }
static void i915_bind_rasterizer_state( struct pipe_context *pipe, static void i915_bind_rasterizer_state( struct pipe_context *pipe,
void *setup ) void *raster )
{ {
struct i915_context *i915 = i915_context(pipe); struct i915_context *i915 = i915_context(pipe);
i915->rasterizer = (struct i915_rasterizer_state *)setup; i915->rasterizer = (struct i915_rasterizer_state *)raster;
/* pass-through to draw module */ /* pass-through to draw module */
draw_set_rasterizer_state(i915->draw, i915->rasterizer->templ); draw_set_rasterizer_state(i915->draw,
(i915->rasterizer ? i915->rasterizer->templ : NULL));
i915->dirty |= I915_NEW_RASTERIZER; i915->dirty |= I915_NEW_RASTERIZER;
} }
static void i915_delete_rasterizer_state(struct pipe_context *pipe, static void i915_delete_rasterizer_state(struct pipe_context *pipe,
void *setup) void *raster)
{ {
FREE(setup); FREE(raster);
} }
static void i915_set_vertex_buffer( struct pipe_context *pipe, static void i915_set_vertex_buffer( struct pipe_context *pipe,