gallium: rename clearRT / clearDS to clear_render_target / clear_depth_stencilgallium-newclear

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

17 files changed, 217 insertions, 217 deletions

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index d05a193bf8..9ae7b38e6e 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 f894fd5a93..10143a5e0f 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 07088a7a72..ad69df3f89 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 1b4eaf2a6e..9dd1002f5f 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 b640c79308..d8fb9f1d6f 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);
 
 
 
diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst
index 037afb0743..27d352b7a3 100644
--- a/src/gallium/docs/source/context.rst
+++ b/src/gallium/docs/source/context.rst
@@ -116,12 +116,12 @@ supports PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE.
 If a surface includes several layers/slices (XXX: not yet...) then all layers
 will be cleared.
 
-``clearRT`` clears a single color rendertarget with the specified color
-value. While it is only possible to clear one surface at a time (which can
+``clear_render_target`` clears a single color rendertarget with the specified
+color value. While it is only possible to clear one surface at a time (which can
 include several layers), this surface need not be bound to the framebuffer.
 
-``clearDS``clears a single depth, stencil or depth/stencil surface with
-the specified depth and stencil values (for combined depth/stencil buffers,
+``clear_depth_stencil``clears a single depth, stencil or depth/stencil surface
+with the specified depth and stencil values (for combined depth/stencil buffers,
 is is also possible to only clear one or the other part). While it is only
 possible to clear one surface at a time (which can include several layers),
 this surface need not be bound to the framebuffer.
diff --git a/src/gallium/drivers/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c
index 9f32cbf296..9c9c1bdc45 100644
--- a/src/gallium/drivers/failover/fo_context.c
+++ b/src/gallium/drivers/failover/fo_context.c
@@ -146,8 +146,8 @@ struct pipe_context *failover_create( struct pipe_context *hw,
    failover->pipe.draw_arrays = failover_draw_arrays;
    failover->pipe.draw_elements = failover_draw_elements;
    failover->pipe.clear = hw->clear;
-   failover->pipe.clearRT = hw->clearRT;
-   failover->pipe.clearDS = hw->clearDS;
+   failover->pipe.clear_render_target = hw->clear_render_target;
+   failover->pipe.clear_depth_stencil = hw->clear_depth_stencil;
 
    /* No software occlusion fallback (or other optional functionality)
     * at this point - if the hardware doesn't support it, don't
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index d9316a1f36..7869be8f68 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -95,11 +95,11 @@ i915_surface_copy(struct pipe_context *pipe,
 
 
 static void
-i915_clearRT(struct pipe_context *pipe,
-             struct pipe_surface *dst,
-             const float *rgba,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height)
+i915_clear_render_target(struct pipe_context *pipe,
+                         struct pipe_surface *dst,
+                         const float *rgba,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height)
 {
    struct i915_texture *tex = i915_texture(dst->texture);
    struct pipe_resource *pt = &tex->b.b;
@@ -120,13 +120,13 @@ i915_clearRT(struct pipe_context *pipe,
 }
 
 static void
-i915_clearDS(struct pipe_context *pipe,
-             struct pipe_surface *dst,
-             unsigned clear_flags,
-             double depth,
-             unsigned stencil,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height)
+i915_clear_depth_stencil(struct pipe_context *pipe,
+                         struct pipe_surface *dst,
+                         unsigned clear_flags,
+                         double depth,
+                         unsigned stencil,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height)
 {
    struct i915_texture *tex = i915_texture(dst->texture);
    struct pipe_resource *pt = &tex->b.b;
@@ -209,8 +209,8 @@ void
 i915_init_surface_functions(struct i915_context *i915)
 {
    i915->base.resource_copy_region = i915_surface_copy;
-   i915->base.clearRT = i915_clearRT;
-   i915->base.clearDS = i915_clearDS;
+   i915->base.clear_render_target = i915_clear_render_target;
+   i915->base.clear_depth_stencil = i915_clear_depth_stencil;
 }
 
 /* No good reason for these to be in the screen.
diff --git a/src/gallium/drivers/i965/brw_pipe_clear.c b/src/gallium/drivers/i965/brw_pipe_clear.c
index b7d8cd5890..d5cff338a6 100644
--- a/src/gallium/drivers/i965/brw_pipe_clear.c
+++ b/src/gallium/drivers/i965/brw_pipe_clear.c
@@ -227,11 +227,11 @@ static void brw_clear(struct pipe_context *pipe,
 }
 
 /* XXX should respect region */
-static void brw_clearRT(struct pipe_context *pipe, 
-                        struct pipe_surface *dst,
-                        const float *rgba,
-                        unsigned dstx, unsigned dsty,
-                        unsigned width, unsigned height)
+static void brw_clear_render_target(struct pipe_context *pipe,
+                                    struct pipe_surface *dst,
+                                    const float *rgba,
+                                    unsigned dstx, unsigned dsty,
+                                    unsigned width, unsigned height)
 {
    struct brw_context *brw = brw_context( pipe );
 
@@ -241,13 +241,13 @@ static void brw_clearRT(struct pipe_context *pipe,
 }
 
 /* XXX should respect region */
-static void brw_clearDS(struct pipe_context *pipe, 
-                        struct pipe_surface *dst,
-                        unsigned clear_flags,
-                        double depth,
-                        unsigned stencil,
-                        unsigned dstx, unsigned dsty,
-                        unsigned width, unsigned height)
+static void brw_clear_depth_stencil(struct pipe_context *pipe,
+                                    struct pipe_surface *dst,
+                                    unsigned clear_flags,
+                                    double depth,
+                                    unsigned stencil,
+                                    unsigned dstx, unsigned dsty,
+                                    unsigned width, unsigned height)
 {
    struct brw_context *brw = brw_context( pipe );
 
@@ -260,8 +260,8 @@ static void brw_clearDS(struct pipe_context *pipe,
 void brw_pipe_clear_init( struct brw_context *brw )
 {
    brw->base.clear = brw_clear;
-   brw->base.clearRT = brw_clearRT;
-   brw->base.clearDS = brw_clearDS;
+   brw->base.clear_render_target = brw_clear_render_target;
+   brw->base.clear_depth_stencil = brw_clear_depth_stencil;
 }
 
 
diff --git a/src/gallium/drivers/identity/id_context.c b/src/gallium/drivers/identity/id_context.c
index 0c3704ceae..898e0b3af8 100644
--- a/src/gallium/drivers/identity/id_context.c
+++ b/src/gallium/drivers/identity/id_context.c
@@ -666,48 +666,48 @@ 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)
+identity_clear_render_target(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);
+   pipe->clear_render_target(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)
+identity_clear_depth_stencil(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);
+   pipe->clear_depth_stencil(pipe,
+                             dst,
+                             clear_flags,
+                             depth,
+                             stencil,
+                             dstx,
+                             dsty,
+                             width,
+                             height);
 
 }
 
@@ -933,8 +933,8 @@ identity_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
    id_pipe->base.set_vertex_buffers = identity_set_vertex_buffers;
    id_pipe->base.resource_copy_region = identity_resource_copy_region;
    id_pipe->base.clear = identity_clear;
-   id_pipe->base.clearRT = identity_clearRT;
-   id_pipe->base.clearDS = identity_clearDS;
+   id_pipe->base.clear_render_target = identity_clear_render_target;
+   id_pipe->base.clear_depth_stencil = identity_clear_depth_stencil;
    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;
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index 470df1b2a2..5535610e0a 100644
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -224,11 +224,11 @@ nv50_surface_copy(struct pipe_context *pipe,
 
 /* XXX this should probably look more along the lines of nv50_clear */
 static void
-nv50_clearRT(struct pipe_context *pipe,
-	     struct pipe_surface *dst,
-	     const float *rgba,
-	     unsigned dstx, unsigned dsty,
-	     unsigned width, unsigned height)
+nv50_clear_render_target(struct pipe_context *pipe,
+			 struct pipe_surface *dst,
+			 const float *rgba,
+			 unsigned dstx, unsigned dsty,
+			 unsigned width, unsigned height)
 {
 	struct nv50_context *nv50 = nv50_context(pipe);
 	struct nv50_screen *screen = nv50->screen;
@@ -264,7 +264,7 @@ void
 nv50_init_surface_functions(struct nv50_context *nv50)
 {
 	nv50->pipe.resource_copy_region = nv50_surface_copy;
-	nv50->pipe.clearRT = nv50_clearRT;
+	nv50->pipe.clear_render_target = nv50_clear_render_target;
 }
 
 
diff --git a/src/gallium/drivers/nvfx/nvfx_surface.c b/src/gallium/drivers/nvfx/nvfx_surface.c
index c853f36f55..44e1af2e6a 100644
--- a/src/gallium/drivers/nvfx/nvfx_surface.c
+++ b/src/gallium/drivers/nvfx/nvfx_surface.c
@@ -56,11 +56,11 @@ nvfx_surface_copy(struct pipe_context *pipe,
 }
 
 static void
-nvfx_clearRT(struct pipe_context *pipe,
-	     struct pipe_surface *dst,
-	     const float *rgba,
-	     unsigned dstx, unsigned dsty,
-	     unsigned width, unsigned height)
+nvfx_clear_render_target(struct pipe_context *pipe,
+			 struct pipe_surface *dst,
+			 const float *rgba,
+			 unsigned dstx, unsigned dsty,
+			 unsigned width, unsigned height)
 {
 	struct nvfx_context *nvfx = nvfx_context(pipe);
 	struct nv04_surface_2d *eng2d = nvfx->screen->eng2d;
@@ -71,13 +71,13 @@ nvfx_clearRT(struct pipe_context *pipe,
 }
 
 static void
-nvfx_clearDS(struct pipe_context *pipe,
-	     struct pipe_surface *dst,
-	     unsigned clear_flags,
-	     double depth,
-	     unsigned stencil,
-	     unsigned dstx, unsigned dsty,
-	     unsigned width, unsigned height)
+nvfx_clear_depth_stencil(struct pipe_context *pipe,
+			 struct pipe_surface *dst,
+			 unsigned clear_flags,
+			 double depth,
+			 unsigned stencil,
+			 unsigned dstx, unsigned dsty,
+			 unsigned width, unsigned height)
 {
 	struct nvfx_context *nvfx = nvfx_context(pipe);
 	struct nv04_surface_2d *eng2d = nvfx->screen->eng2d;
@@ -91,6 +91,6 @@ void
 nvfx_init_surface_functions(struct nvfx_context *nvfx)
 {
 	nvfx->pipe.resource_copy_region = nvfx_surface_copy;
-	nvfx->pipe.clearRT = nvfx_clearRT;
-	nvfx->pipe.clearDS = nvfx_clearDS;
+	nvfx->pipe.clear_render_target = nvfx_clear_render_target;
+	nvfx->pipe.clear_depth_stencil = nvfx_clear_depth_stencil;
 }
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 3acd0740f9..49ec51fd13 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -189,43 +189,43 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
 }
 
 /* Clear a region of a color surface to a constant value. */
-static void r300_clearRT(struct pipe_context *pipe,
-                         struct pipe_surface *dst,
-                         const float *rgba,
-                         unsigned dstx, unsigned dsty,
-                         unsigned width, unsigned height)
+static void r300_clear_render_target(struct pipe_context *pipe,
+                                     struct pipe_surface *dst,
+                                     const float *rgba,
+                                     unsigned dstx, unsigned dsty,
+                                     unsigned width, unsigned height)
 {
     struct r300_context *r300 = r300_context(pipe);
 
     r300_blitter_save_states(r300);
     util_blitter_save_framebuffer(r300->blitter, r300->fb_state.state);
 
-    util_blitter_clearRT(r300->blitter, dst, rgba,
-                         dstx, dsty, width, height);
+    util_blitter_clear_render_target(r300->blitter, dst, rgba,
+                                     dstx, dsty, width, height);
 }
 
 /* Clear a region of a depth stencil surface. */
-static void r300_clearDS(struct pipe_context *pipe,
-                         struct pipe_surface *dst,
-                         unsigned clear_flags,
-                         double depth,
-                         unsigned stencil,
-                         unsigned dstx, unsigned dsty,
-                         unsigned width, unsigned height)
+static void r300_clear_depth_stencil(struct pipe_context *pipe,
+                                     struct pipe_surface *dst,
+                                     unsigned clear_flags,
+                                     double depth,
+                                     unsigned stencil,
+                                     unsigned dstx, unsigned dsty,
+                                     unsigned width, unsigned height)
 {
     struct r300_context *r300 = r300_context(pipe);
 
     r300_blitter_save_states(r300);
     util_blitter_save_framebuffer(r300->blitter, r300->fb_state.state);
 
-    util_blitter_clearDS(r300->blitter, dst, clear_flags, depth, stencil,
-                         dstx, dsty, width, height);
+    util_blitter_clear_depth_stencil(r300->blitter, dst, clear_flags, depth, stencil,
+                                     dstx, dsty, width, height);
 }
 
 void r300_init_blit_functions(struct r300_context *r300)
 {
     r300->context.clear = r300_clear;
-    r300->context.clearRT = r300_clearRT;
-    r300->context.clearDS = r300_clearDS;
+    r300->context.clear_render_target = r300_clear_render_target;
+    r300->context.clear_depth_stencil = r300_clear_depth_stencil;
     r300->context.resource_copy_region = r300_resource_copy_region;
 }
diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c
index b2948311b9..164d811ab4 100644
--- a/src/gallium/drivers/rbug/rbug_context.c
+++ b/src/gallium/drivers/rbug/rbug_context.c
@@ -817,49 +817,49 @@ rbug_clear(struct pipe_context *_pipe,
 }
 
 static void
-rbug_clearRT(struct pipe_context *_pipe,
-             struct pipe_surface *_dst,
-             const float *rgba,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height)
+rbug_clear_render_target(struct pipe_context *_pipe,
+                         struct pipe_surface *_dst,
+                         const float *rgba,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height)
 {
    struct rbug_context *rb_pipe = rbug_context(_pipe);
    struct rbug_surface *rb_surface_dst = rbug_surface(_dst);
    struct pipe_context *pipe = rb_pipe->pipe;
    struct pipe_surface *dst = rb_surface_dst->surface;
 
-   pipe->clearRT(pipe,
-                 dst,
-                 rgba,
-                 dstx,
-                 dsty,
-                 width,
-                 height);
+   pipe->clear_render_target(pipe,
+                             dst,
+                             rgba,
+                             dstx,
+                             dsty,
+                             width,
+                             height);
 }
 
 static void
-rbug_clearDS(struct pipe_context *_pipe,
-             struct pipe_surface *_dst,
-             unsigned clear_flags,
-             double depth,
-             unsigned stencil,
-             unsigned dstx, unsigned dsty,
-             unsigned width, unsigned height)
+rbug_clear_depth_stencil(struct pipe_context *_pipe,
+                         struct pipe_surface *_dst,
+                         unsigned clear_flags,
+                         double depth,
+                         unsigned stencil,
+                         unsigned dstx, unsigned dsty,
+                         unsigned width, unsigned height)
 {
    struct rbug_context *rb_pipe = rbug_context(_pipe);
    struct rbug_surface *rb_surface_dst = rbug_surface(_dst);
    struct pipe_context *pipe = rb_pipe->pipe;
    struct pipe_surface *dst = rb_surface_dst->surface;
 
-   pipe->clearDS(pipe,
-                 dst,
-                 clear_flags,
-                 depth,
-                 stencil,
-                 dstx,
-                 dsty,
-                 width,
-                 height);
+   pipe->clear_depth_stencil(pipe,
+                             dst,
+                             clear_flags,
+                             depth,
+                             stencil,
+                             dstx,
+                             dsty,
+                             width,
+                             height);
 }
 
 static void
@@ -1095,8 +1095,8 @@ rbug_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
    rb_pipe->base.set_sample_mask = rbug_set_sample_mask;
    rb_pipe->base.resource_copy_region = rbug_resource_copy_region;
    rb_pipe->base.clear = rbug_clear;
-   rb_pipe->base.clearRT = rbug_clearRT;
-   rb_pipe->base.clearDS = rbug_clearDS;
+   rb_pipe->base.clear_render_target = rbug_clear_render_target;
+   rb_pipe->base.clear_depth_stencil = rbug_clear_depth_stencil;
    rb_pipe->base.flush = rbug_flush;
    rb_pipe->base.is_resource_referenced = rbug_is_resource_referenced;
    rb_pipe->base.create_sampler_view = rbug_context_create_sampler_view;
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index e8ac33f6e5..7584b8d437 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -1109,18 +1109,18 @@ trace_context_clear(struct pipe_context *_pipe,
 
 
 static INLINE void
-trace_context_clearRT(struct pipe_context *_pipe,
-                      struct pipe_surface *dst,
-                      const float *rgba,
-                      unsigned dstx, unsigned dsty,
-                      unsigned width, unsigned height)
+trace_context_clear_render_target(struct pipe_context *_pipe,
+                                  struct pipe_surface *dst,
+                                  const float *rgba,
+                                  unsigned dstx, unsigned dsty,
+                                  unsigned width, unsigned height)
 {
    struct trace_context *tr_ctx = trace_context(_pipe);
    struct pipe_context *pipe = tr_ctx->pipe;
 
    dst = trace_surface_unwrap(tr_ctx, dst);
 
-   trace_dump_call_begin("pipe_context", "clearRT");
+   trace_dump_call_begin("pipe_context", "clear_render_target");
 
    trace_dump_arg(ptr, pipe);
    trace_dump_arg(ptr, dst);
@@ -1130,26 +1130,26 @@ trace_context_clearRT(struct pipe_context *_pipe,
    trace_dump_arg(uint, width);
    trace_dump_arg(uint, height);
 
-   pipe->clearRT(pipe, dst, rgba, dstx, dsty, width, height);
+   pipe->clear_render_target(pipe, dst, rgba, dstx, dsty, width, height);
 
    trace_dump_call_end();
 }
 
 static INLINE void
-trace_context_clearDS(struct pipe_context *_pipe,
-                      struct pipe_surface *dst,
-                      unsigned clear_flags,
-                      double depth,
-                      unsigned stencil,
-                      unsigned dstx, unsigned dsty,
-                      unsigned width, unsigned height)
+trace_context_clear_depth_stencil(struct pipe_context *_pipe,
+                                  struct pipe_surface *dst,
+                                  unsigned clear_flags,
+                                  double depth,
+                                  unsigned stencil,
+                                  unsigned dstx, unsigned dsty,
+                                  unsigned width, unsigned height)
 {
    struct trace_context *tr_ctx = trace_context(_pipe);
    struct pipe_context *pipe = tr_ctx->pipe;
 
    dst = trace_surface_unwrap(tr_ctx, dst);
 
-   trace_dump_call_begin("pipe_context", "clearDS");
+   trace_dump_call_begin("pipe_context", "clear_depth_stencil");
 
    trace_dump_arg(ptr, pipe);
    trace_dump_arg(ptr, dst);
@@ -1161,8 +1161,8 @@ trace_context_clearDS(struct pipe_context *_pipe,
    trace_dump_arg(uint, width);
    trace_dump_arg(uint, height);
 
-   pipe->clearDS(pipe, dst, clear_flags, depth, stencil,
-                 dstx, dsty, width, height);
+   pipe->clear_depth_stencil(pipe, dst, clear_flags, depth, stencil,
+                             dstx, dsty, width, height);
 
    trace_dump_call_end();
 }
@@ -1479,8 +1479,8 @@ trace_context_create(struct trace_screen *tr_scr,
    tr_ctx->base.set_vertex_buffers = trace_context_set_vertex_buffers;
    tr_ctx->base.resource_copy_region = trace_context_resource_copy_region;
    tr_ctx->base.clear = trace_context_clear;
-   tr_ctx->base.clearRT = trace_context_clearRT;
-   tr_ctx->base.clearDS = trace_context_clearDS;
+   tr_ctx->base.clear_render_target = trace_context_clear_render_target;
+   tr_ctx->base.clear_depth_stencil = trace_context_clear_depth_stencil;
    tr_ctx->base.flush = trace_context_flush;
    tr_ctx->base.is_resource_referenced = trace_is_resource_referenced;
 
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 51f52406d1..3e082bef2f 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -287,11 +287,11 @@ struct pipe_context {
     * Clear a color rendertarget surface.
     * \param rgba  pointer to an array of one float for each of r, g, b, a.
     */
-   void (*clearRT)(struct pipe_context *pipe,
-                   struct pipe_surface *dst,
-                   const float *rgba,
-                   unsigned dstx, unsigned dsty,
-                   unsigned width, unsigned height);
+   void (*clear_render_target)(struct pipe_context *pipe,
+                               struct pipe_surface *dst,
+                               const float *rgba,
+                               unsigned dstx, unsigned dsty,
+                               unsigned width, unsigned height);
 
    /**
     * Clear a depth-stencil surface.
@@ -299,13 +299,13 @@ struct pipe_context {
     * \param depth  depth clear value in [0,1].
     * \param stencil  stencil clear value
     */
-   void (*clearDS)(struct pipe_context *pipe,
-                   struct pipe_surface *dst,
-                   unsigned clear_flags,
-                   double depth,
-                   unsigned stencil,
-                   unsigned dstx, unsigned dsty,
-                   unsigned width, unsigned height);
+   void (*clear_depth_stencil)(struct pipe_context *pipe,
+                               struct pipe_surface *dst,
+                               unsigned clear_flags,
+                               double depth,
+                               unsigned stencil,
+                               unsigned dstx, unsigned dsty,
+                               unsigned width, unsigned height);
 
    /** Flush rendering
     * \param flags  bitmask of PIPE_FLUSH_x tokens)
diff --git a/src/gallium/state_trackers/python/p_context.i b/src/gallium/state_trackers/python/p_context.i
index 6a6da1477c..0294e769a6 100644
--- a/src/gallium/state_trackers/python/p_context.i
+++ b/src/gallium/state_trackers/python/p_context.i
@@ -447,10 +447,10 @@ error1:
                                      src->texture, subsrc, srcx, srcy, src->zslice, width, height);
    }
 
-   void clearRT(struct st_surface *dst,
-                float *rgba,
-                unsigned x, unsigned y,
-                unsigned width, unsigned height)
+   void clear_render_target(struct st_surface *dst,
+                            float *rgba,
+                            unsigned x, unsigned y,
+                            unsigned width, unsigned height)
    {
       struct pipe_surface *_dst = NULL;
 
@@ -458,18 +458,18 @@ error1:
       if(!_dst)
          SWIG_exception(SWIG_ValueError, "couldn't acquire destination surface for writing");
 
-      $self->pipe->clearRT($self->pipe, _dst, rgba, x, y, width, height);
+      $self->pipe->clear_render_target($self->pipe, _dst, rgba, x, y, width, height);
 
    fail:
       pipe_surface_reference(&_dst, NULL);
    }
 
-   void clearDS(struct st_surface *dst,
-                unsigned clear_flags,
-                double depth,
-                unsigned stencil,
-                unsigned x, unsigned y,
-                unsigned width, unsigned height)
+   void clear_depth_stencil(struct st_surface *dst,
+                            unsigned clear_flags,
+                            double depth,
+                            unsigned stencil,
+                            unsigned x, unsigned y,
+                            unsigned width, unsigned height)
    {
       struct pipe_surface *_dst = NULL;
 
@@ -477,8 +477,8 @@ error1:
       if(!_dst)
          SWIG_exception(SWIG_ValueError, "couldn't acquire destination surface for writing");
 
-      $self->pipe->clearDS($self->pipe, _dst, clear_flags, depth, stencil,
-                           x, y, width, height);
+      $self->pipe->clear_depth_stencil($self->pipe, _dst, clear_flags, depth, stencil,
+                                       x, y, width, height);
 
    fail:
       pipe_surface_reference(&_dst, NULL);