diff options
Diffstat (limited to 'src/gallium/drivers/nv30')
-rw-r--r-- | src/gallium/drivers/nv30/nv30_draw.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/nv30_state.c | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c index e0a1628eb91..85b4fcd877b 100644 --- a/src/gallium/drivers/nv30/nv30_draw.c +++ b/src/gallium/drivers/nv30/nv30_draw.c @@ -373,7 +373,7 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) nv30_render_validate(nv30); if (nv30->draw_dirty & NV30_NEW_VIEWPORT) - draw_set_viewport_state(draw, &nv30->viewport); + draw_set_viewport_states(draw, 0, 1, &nv30->viewport); if (nv30->draw_dirty & NV30_NEW_RASTERIZER) draw_set_rasterizer_state(draw, &nv30->rast->pipe, NULL); if (nv30->draw_dirty & NV30_NEW_CLIP) diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c index 2a80974d126..55f2b8c0a77 100644 --- a/src/gallium/drivers/nv30/nv30_state.c +++ b/src/gallium/drivers/nv30/nv30_state.c @@ -373,8 +373,10 @@ nv30_set_polygon_stipple(struct pipe_context *pipe, } static void -nv30_set_scissor_state(struct pipe_context *pipe, - const struct pipe_scissor_state *scissor) +nv30_set_scissor_states(struct pipe_context *pipe, + unsigned start_slot, + unsigned num_viewports, + const struct pipe_scissor_state *scissor) { struct nv30_context *nv30 = nv30_context(pipe); @@ -383,8 +385,10 @@ nv30_set_scissor_state(struct pipe_context *pipe, } static void -nv30_set_viewport_state(struct pipe_context *pipe, - const struct pipe_viewport_state *vpt) +nv30_set_viewport_states(struct pipe_context *pipe, + unsigned start_slot, + unsigned num_viewports, + const struct pipe_viewport_state *vpt) { struct nv30_context *nv30 = nv30_context(pipe); @@ -446,8 +450,8 @@ nv30_state_init(struct pipe_context *pipe) pipe->set_constant_buffer = nv30_set_constant_buffer; pipe->set_framebuffer_state = nv30_set_framebuffer_state; pipe->set_polygon_stipple = nv30_set_polygon_stipple; - pipe->set_scissor_state = nv30_set_scissor_state; - pipe->set_viewport_state = nv30_set_viewport_state; + pipe->set_scissor_states = nv30_set_scissor_states; + pipe->set_viewport_states = nv30_set_viewport_states; pipe->set_vertex_buffers = nv30_set_vertex_buffers; pipe->set_index_buffer = nv30_set_index_buffer; |