gallium: Add support for multiple viewports

Gallium supported only a single viewport/scissor combination. This
commit changes the interface to allow us to add support for multiple
viewports/scissors.

Signed-off-by: Zack Rusin <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: José Fonseca<[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/gallium/drivers/ilo/ilo_state.c b/src/gallium/drivers/ilo/ilo_state.c
index 8443a2cc9d2..33da429bf37 100644
--- a/src/gallium/drivers/ilo/ilo_state.c
+++ b/src/gallium/drivers/ilo/ilo_state.c
@@ -563,8 +563,10 @@ ilo_set_polygon_stipple(struct pipe_context *pipe,
 }
 
 static void
-ilo_set_scissor_state(struct pipe_context *pipe,
-                      const struct pipe_scissor_state *state)
+ilo_set_scissor_states(struct pipe_context *pipe,
+                       unsigned start_slot,
+                       unsigned num_scissors,
+                       const struct pipe_scissor_state *state)
 {
    struct ilo_context *ilo = ilo_context(pipe);
 
@@ -574,8 +576,10 @@ ilo_set_scissor_state(struct pipe_context *pipe,
 }
 
 static void
-ilo_set_viewport_state(struct pipe_context *pipe,
-                       const struct pipe_viewport_state *state)
+ilo_set_viewport_states(struct pipe_context *pipe,
+                        unsigned start_slot,
+                        unsigned num_viewports,
+                        const struct pipe_viewport_state *state)
 {
    struct ilo_context *ilo = ilo_context(pipe);
 
@@ -992,8 +996,8 @@ ilo_init_state_functions(struct ilo_context *ilo)
    ilo->base.set_constant_buffer = ilo_set_constant_buffer;
    ilo->base.set_framebuffer_state = ilo_set_framebuffer_state;
    ilo->base.set_polygon_stipple = ilo_set_polygon_stipple;
-   ilo->base.set_scissor_state = ilo_set_scissor_state;
-   ilo->base.set_viewport_state = ilo_set_viewport_state;
+   ilo->base.set_scissor_states = ilo_set_scissor_states;
+   ilo->base.set_viewport_states = ilo_set_viewport_states;
    ilo->base.set_fragment_sampler_views = ilo_set_fragment_sampler_views;
    ilo->base.set_vertex_sampler_views = ilo_set_vertex_sampler_views;
    ilo->base.set_geometry_sampler_views = ilo_set_geometry_sampler_views;