gallium: rename clearRT / clearDS to clear_render_target / clear_depth_stencil

more consistent with rest of gallium naming conventions.
Also rename driver-internal names for these the same.

5 files changed, 41 insertions, 41 deletions

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index d05a193bf8d..9ae7b38e6e9 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -26,7 +26,7 @@
 
 /**
  * @file
- * Blitter utility to facilitate acceleration of the clear, clearRT, clearDS
+ * Blitter utility to facilitate acceleration of the clear, clear_render_target, clear_depth_stencil
  * resource_copy_region functions.
  *
  * @author Marek Olšák
@@ -781,11 +781,11 @@ void util_blitter_copy_region(struct blitter_context *blitter,
 }
 
 /* Clear a region of a color surface to a constant value. */
-void util_blitter_clearRT(struct blitter_context *blitter,
-                          struct pipe_surface *dstsurf,
-                          const float *rgba,
-                          unsigned dstx, unsigned dsty,
-                          unsigned width, unsigned height)
+void util_blitter_clear_render_target(struct blitter_context *blitter,
+                                      struct pipe_surface *dstsurf,
+                                      const float *rgba,
+                                      unsigned dstx, unsigned dsty,
+                                      unsigned width, unsigned height)
 {
    struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
    struct pipe_context *pipe = ctx->pipe;
@@ -822,13 +822,13 @@ void util_blitter_clearRT(struct blitter_context *blitter,
 }
 
 /* Clear a region of a depth stencil surface. */
-void util_blitter_clearDS(struct blitter_context *blitter,
-                          struct pipe_surface *dstsurf,
-                          unsigned clear_flags,
-                          double depth,
-                          unsigned stencil,
-                          unsigned dstx, unsigned dsty,
-                          unsigned width, unsigned height)
+void util_blitter_clear_depth_stencil(struct blitter_context *blitter,
+                                      struct pipe_surface *dstsurf,
+                                      unsigned clear_flags,
+                                      double depth,
+                                      unsigned stencil,
+                                      unsigned dstx, unsigned dsty,
+                                      unsigned width, unsigned height)
 {
    struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
    struct pipe_context *pipe = ctx->pipe;
diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h
index f894fd5a933..10143a5e0f2 100644
--- a/src/gallium/auxiliary/util/u_blitter.h
+++ b/src/gallium/auxiliary/util/u_blitter.h
@@ -129,11 +129,11 @@ void util_blitter_copy_region(struct blitter_context *blitter,
  * already required to be saved:
  * - framebuffer state
  */
-void util_blitter_clearRT(struct blitter_context *blitter,
-                          struct pipe_surface *dst,
-                          const float *rgba,
-                          unsigned dstx, unsigned dsty,
-                          unsigned width, unsigned height);
+void util_blitter_clear_render_target(struct blitter_context *blitter,
+                                      struct pipe_surface *dst,
+                                      const float *rgba,
+                                      unsigned dstx, unsigned dsty,
+                                      unsigned width, unsigned height);
 
 /**
  * Clear a region of a depth-stencil surface, both stencil and depth
@@ -143,13 +143,13 @@ void util_blitter_clearRT(struct blitter_context *blitter,
  * already required to be saved:
  * - framebuffer state
  */
-void util_blitter_clearDS(struct blitter_context *blitter,
-                          struct pipe_surface *dst,
-                          unsigned clear_flags,
-                          double depth,
-                          unsigned stencil,
-                          unsigned dstx, unsigned dsty,
-                          unsigned width, unsigned height);
+void util_blitter_clear_depth_stencil(struct blitter_context *blitter,
+                                      struct pipe_surface *dst,
+                                      unsigned clear_flags,
+                                      double depth,
+                                      unsigned stencil,
+                                      unsigned dstx, unsigned dsty,
+                                      unsigned width, unsigned height);
 
 /* The functions below should be used to save currently bound constant state
  * objects inside a driver. The objects are automatically restored at the end
diff --git a/src/gallium/auxiliary/util/u_clear.h b/src/gallium/auxiliary/util/u_clear.h
index 07088a7a727..ad69df3f898 100644
--- a/src/gallium/auxiliary/util/u_clear.h
+++ b/src/gallium/auxiliary/util/u_clear.h
@@ -46,14 +46,14 @@ util_clear(struct pipe_context *pipe,
       unsigned i;
       for (i = 0; i < framebuffer->nr_cbufs; i++) {
          struct pipe_surface *ps = framebuffer->cbufs[i];
-         pipe->clearRT(pipe, ps, rgba, 0, 0, ps->width, ps->height);
+         pipe->clear_render_target(pipe, ps, rgba, 0, 0, ps->width, ps->height);
       }
    }
 
    if (buffers & PIPE_CLEAR_DEPTHSTENCIL) {
       struct pipe_surface *ps = framebuffer->zsbuf;
-      pipe->clearDS(pipe, ps, buffers & PIPE_CLEAR_DEPTHSTENCIL,
-                    depth, stencil,
-                    0, 0, ps->width, ps->height);
+      pipe->clear_depth_stencil(pipe, ps, buffers & PIPE_CLEAR_DEPTHSTENCIL,
+                                depth, stencil,
+                                0, 0, ps->width, ps->height);
    }
 }
diff --git a/src/gallium/auxiliary/util/u_surface.c b/src/gallium/auxiliary/util/u_surface.c
index 1b4eaf2a6e6..9dd1002f5f6 100644
--- a/src/gallium/auxiliary/util/u_surface.c
+++ b/src/gallium/auxiliary/util/u_surface.c
@@ -196,19 +196,19 @@ util_resource_copy_region(struct pipe_context *pipe,
 
 
 /**
- * Fallback for pipe->clearRT() function.
+ * Fallback for pipe->clear_render_target() function.
  * XXX this looks too hackish to be really useful.
  * cpp > 4 looks like a gross hack at best...
- * and we're missing the equivalent clearDS fallback.
+ * and we're missing the equivalent clear_depth_stencil fallback.
  * Plus can't use these transfer fallbacks when clearing
  * multisampled surfaces for instance.
  */
 void
-util_clearRT(struct pipe_context *pipe,
-             struct pipe_surface *dst,
-             const float *rgba,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height)
+util_clear_render_target(struct pipe_context *pipe,
+                         struct pipe_surface *dst,
+                         const float *rgba,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height)
 {
    struct pipe_transfer *dst_trans;
    void *dst_map;
diff --git a/src/gallium/auxiliary/util/u_surface.h b/src/gallium/auxiliary/util/u_surface.h
index b640c793085..d8fb9f1d6f9 100644
--- a/src/gallium/auxiliary/util/u_surface.h
+++ b/src/gallium/auxiliary/util/u_surface.h
@@ -57,11 +57,11 @@ util_resource_copy_region(struct pipe_context *pipe,
                           unsigned w, unsigned h);
 
 extern void
-util_clearRT(struct pipe_context *pipe,
-             struct pipe_surface *dst,
-             const float *rgba,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height);
+util_clear_render_target(struct pipe_context *pipe,
+                         struct pipe_surface *dst,
+                         const float *rgba,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height);