Mesa (master): identity: adapt to clear interface changes

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: 25296a3ed380f2a2179a9f435645a7ccaf10c04c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25296a3ed380f2a2179a9f435645a7ccaf10c04c

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Sat May 29 01:19:48 2010 +0200

identity: adapt to clear interface changes

---

 src/gallium/drivers/identity/id_context.c |   76 ++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/gallium/drivers/identity/id_context.c b/src/gallium/drivers/identity/id_context.c
index 9813170..0c3704c 100644
--- a/src/gallium/drivers/identity/id_context.c
+++ b/src/gallium/drivers/identity/id_context.c
@@ -649,33 +649,6 @@ identity_resource_copy_region(struct pipe_context *_pipe,
 }
 
 static void
-identity_resource_fill_region(struct pipe_context *_pipe,
-                              struct pipe_resource *_dst,
-                              struct pipe_subresource subdst,
-                              unsigned dstx,
-                              unsigned dsty,
-                              unsigned dstz,
-                              unsigned width,
-                              unsigned height,
-                              unsigned value)
-{
-   struct identity_context *id_pipe = identity_context(_pipe);
-   struct identity_resource *id_resource_dst = identity_resource(_dst);
-   struct pipe_context *pipe = id_pipe->pipe;
-   struct pipe_resource *dst = id_resource_dst->resource;
-
-   pipe->resource_fill_region(pipe,
-                              dst,
-                              subdst,
-                              dstx,
-                              dsty,
-                              dstz,
-                              width,
-                              height,
-                              value);
-}
-
-static void
 identity_clear(struct pipe_context *_pipe,
                unsigned buffers,
                const float *rgba,
@@ -693,6 +666,52 @@ identity_clear(struct pipe_context *_pipe,
 }
 
 static void
+identity_clearRT(struct pipe_context *_pipe,
+                 struct pipe_surface *_dst,
+                 const float *rgba,
+                 unsigned dstx, unsigned dsty,
+                 unsigned width, unsigned height)
+{
+   struct identity_context *id_pipe = identity_context(_pipe);
+   struct identity_surface *id_surface_dst = identity_surface(_dst);
+   struct pipe_context *pipe = id_pipe->pipe;
+   struct pipe_surface *dst = id_surface_dst->surface;
+
+   pipe->clearRT(pipe,
+                 dst,
+                 rgba,
+                 dstx,
+                 dsty,
+                 width,
+                 height);
+}
+static void
+identity_clearDS(struct pipe_context *_pipe,
+                        struct pipe_surface *_dst,
+                        unsigned clear_flags,
+                        double depth,
+                        unsigned stencil,
+                        unsigned dstx, unsigned dsty,
+                        unsigned width, unsigned height)
+{
+   struct identity_context *id_pipe = identity_context(_pipe);
+   struct identity_surface *id_surface_dst = identity_surface(_dst);
+   struct pipe_context *pipe = id_pipe->pipe;
+   struct pipe_surface *dst = id_surface_dst->surface;
+
+   pipe->clearDS(pipe,
+                 dst,
+                 clear_flags,
+                 depth,
+                 stencil,
+                 dstx,
+                 dsty,
+                 width,
+                 height);
+
+}
+
+static void
 identity_flush(struct pipe_context *_pipe,
                unsigned flags,
                struct pipe_fence_handle **fence)
@@ -913,8 +932,9 @@ identity_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
    id_pipe->base.set_vertex_sampler_views = identity_set_vertex_sampler_views;
    id_pipe->base.set_vertex_buffers = identity_set_vertex_buffers;
    id_pipe->base.resource_copy_region = identity_resource_copy_region;
-   id_pipe->base.resource_fill_region = identity_resource_fill_region;
    id_pipe->base.clear = identity_clear;
+   id_pipe->base.clearRT = identity_clearRT;
+   id_pipe->base.clearDS = identity_clearDS;
    id_pipe->base.flush = identity_flush;
    id_pipe->base.is_resource_referenced = identity_is_resource_referenced;
    id_pipe->base.create_sampler_view = identity_context_create_sampler_view;