[Mesa-dev] [PATCH 1/3] i965: Rename two intelEmit*Blit functions to not use camel-case
Ian Romanick
idr at freedesktop.org
Thu Nov 20 10:12:45 PST 2014
Just clearing some old patch back log...
Patch 1 is
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
With Matt's nits about patch 2 fixed, it is also R-b, but I guess the
point of that patch is really to enable patch 3. Where do we stand on that?
On 10/01/2014 02:07 PM, Jason Ekstrand wrote:
> I think these are about the only remaining uses of camel-case in the i965
> driver. Let's make things more consistent.
>
> Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
> ---
> src/mesa/drivers/dri/i965/intel_blit.c | 108 ++++++++++++-------------
> src/mesa/drivers/dri/i965/intel_blit.h | 51 ++++++------
> src/mesa/drivers/dri/i965/intel_copy_image.c | 30 +++----
> src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 26 +++---
> 4 files changed, 108 insertions(+), 107 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
> index 73ab488..f9e2e30 100644
> --- a/src/mesa/drivers/dri/i965/intel_blit.c
> +++ b/src/mesa/drivers/dri/i965/intel_blit.c
> @@ -195,9 +195,9 @@ intel_miptree_blit(struct brw_context *brw,
> * represented per scan line’s worth of graphics data depends on the
> * color depth.
> *
> - * Furthermore, intelEmitCopyBlit (which is called below) uses a signed
> - * 16-bit integer to represent buffer pitch, so it can only handle buffer
> - * pitches < 32k.
> + * Furthermore, intel_emit_copy_blit (which is called below) uses a
> + * signed 16-bit integer to represent buffer pitch, so it can only
> + * handle buffer pitches < 32k.
> *
> * As a result of these two limitations, we can only use the blitter to do
> * this copy when the miptree's pitch is less than 32k.
> @@ -258,18 +258,18 @@ intel_miptree_blit(struct brw_context *brw,
> return false;
> }
>
> - if (!intelEmitCopyBlit(brw,
> - src_mt->cpp,
> - src_pitch,
> - src_mt->bo, src_mt->offset,
> - src_mt->tiling,
> - dst_mt->pitch,
> - dst_mt->bo, dst_mt->offset,
> - dst_mt->tiling,
> - src_x, src_y,
> - dst_x, dst_y,
> - width, height,
> - logicop)) {
> + if (!intel_emit_copy_blit(brw,
> + src_mt->cpp,
> + src_pitch,
> + src_mt->bo, src_mt->offset,
> + src_mt->tiling,
> + dst_mt->pitch,
> + dst_mt->bo, dst_mt->offset,
> + dst_mt->tiling,
> + src_x, src_y,
> + dst_x, dst_y,
> + width, height,
> + logicop)) {
> return false;
> }
>
> @@ -286,20 +286,20 @@ intel_miptree_blit(struct brw_context *brw,
> /* Copy BitBlt
> */
> bool
> -intelEmitCopyBlit(struct brw_context *brw,
> - GLuint cpp,
> - GLshort src_pitch,
> - drm_intel_bo *src_buffer,
> - GLuint src_offset,
> - uint32_t src_tiling,
> - GLshort dst_pitch,
> - drm_intel_bo *dst_buffer,
> - GLuint dst_offset,
> - uint32_t dst_tiling,
> - GLshort src_x, GLshort src_y,
> - GLshort dst_x, GLshort dst_y,
> - GLshort w, GLshort h,
> - GLenum logic_op)
> +intel_emit_copy_blit(struct brw_context *brw,
> + GLuint cpp,
> + GLshort src_pitch,
> + drm_intel_bo *src_buffer,
> + GLuint src_offset,
> + uint32_t src_tiling,
> + GLshort dst_pitch,
> + drm_intel_bo *dst_buffer,
> + GLuint dst_offset,
> + uint32_t dst_tiling,
> + GLshort src_x, GLshort src_y,
> + GLshort dst_x, GLshort dst_y,
> + GLshort w, GLshort h,
> + GLenum logic_op)
> {
> GLuint CMD, BR13, pass = 0;
> int dst_y2 = dst_y + h;
> @@ -435,17 +435,17 @@ intelEmitCopyBlit(struct brw_context *brw,
> }
>
> bool
> -intelEmitImmediateColorExpandBlit(struct brw_context *brw,
> - GLuint cpp,
> - GLubyte *src_bits, GLuint src_size,
> - GLuint fg_color,
> - GLshort dst_pitch,
> - drm_intel_bo *dst_buffer,
> - GLuint dst_offset,
> - uint32_t dst_tiling,
> - GLshort x, GLshort y,
> - GLshort w, GLshort h,
> - GLenum logic_op)
> +intel_emit_immediate_color_expand_blit(struct brw_context *brw,
> + GLuint cpp,
> + GLubyte *src_bits, GLuint src_size,
> + GLuint fg_color,
> + GLshort dst_pitch,
> + drm_intel_bo *dst_buffer,
> + GLuint dst_offset,
> + uint32_t dst_tiling,
> + GLshort x, GLshort y,
> + GLshort w, GLshort h,
> + GLenum logic_op)
> {
> int dwords = ALIGN(src_size, 8) / 4;
> uint32_t opcode, br13, blit_cmd;
> @@ -540,13 +540,13 @@ intel_emit_linear_blit(struct brw_context *brw,
> */
> pitch = ROUND_DOWN_TO(MIN2(size, (1 << 15) - 1), 4);
> height = (pitch == 0) ? 1 : size / pitch;
> - ok = intelEmitCopyBlit(brw, 1,
> - pitch, src_bo, src_offset, I915_TILING_NONE,
> - pitch, dst_bo, dst_offset, I915_TILING_NONE,
> - 0, 0, /* src x/y */
> - 0, 0, /* dst x/y */
> - pitch, height, /* w, h */
> - GL_COPY);
> + ok = intel_emit_copy_blit(brw, 1,
> + pitch, src_bo, src_offset, I915_TILING_NONE,
> + pitch, dst_bo, dst_offset, I915_TILING_NONE,
> + 0, 0, /* src x/y */
> + 0, 0, /* dst x/y */
> + pitch, height, /* w, h */
> + GL_COPY);
> if (!ok)
> _mesa_problem(ctx, "Failed to linear blit %dx%d\n", pitch, height);
>
> @@ -556,13 +556,13 @@ intel_emit_linear_blit(struct brw_context *brw,
> assert (size < (1 << 15));
> pitch = ALIGN(size, 4);
> if (size != 0) {
> - ok = intelEmitCopyBlit(brw, 1,
> - pitch, src_bo, src_offset, I915_TILING_NONE,
> - pitch, dst_bo, dst_offset, I915_TILING_NONE,
> - 0, 0, /* src x/y */
> - 0, 0, /* dst x/y */
> - size, 1, /* w, h */
> - GL_COPY);
> + ok = intel_emit_copy_blit(brw, 1,
> + pitch, src_bo, src_offset, I915_TILING_NONE,
> + pitch, dst_bo, dst_offset, I915_TILING_NONE,
> + 0, 0, /* src x/y */
> + 0, 0, /* dst x/y */
> + size, 1, /* w, h */
> + GL_COPY);
> if (!ok)
> _mesa_problem(ctx, "Failed to linear blit %dx%d\n", size, 1);
> }
> diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/intel_blit.h
> index f563939..b7cf0bb 100644
> --- a/src/mesa/drivers/dri/i965/intel_blit.h
> +++ b/src/mesa/drivers/dri/i965/intel_blit.h
> @@ -31,20 +31,20 @@
> #include "brw_context.h"
>
> bool
> -intelEmitCopyBlit(struct brw_context *brw,
> - GLuint cpp,
> - GLshort src_pitch,
> - drm_intel_bo *src_buffer,
> - GLuint src_offset,
> - uint32_t src_tiling,
> - GLshort dst_pitch,
> - drm_intel_bo *dst_buffer,
> - GLuint dst_offset,
> - uint32_t dst_tiling,
> - GLshort srcx, GLshort srcy,
> - GLshort dstx, GLshort dsty,
> - GLshort w, GLshort h,
> - GLenum logicop );
> +intel_emit_copy_blit(struct brw_context *brw,
> + GLuint cpp,
> + GLshort src_pitch,
> + drm_intel_bo *src_buffer,
> + GLuint src_offset,
> + uint32_t src_tiling,
> + GLshort dst_pitch,
> + drm_intel_bo *dst_buffer,
> + GLuint dst_offset,
> + uint32_t dst_tiling,
> + GLshort srcx, GLshort srcy,
> + GLshort dstx, GLshort dsty,
> + GLshort w, GLshort h,
> + GLenum logicop );
>
> bool intel_miptree_blit(struct brw_context *brw,
> struct intel_mipmap_tree *src_mt,
> @@ -57,17 +57,18 @@ bool intel_miptree_blit(struct brw_context *brw,
> GLenum logicop);
>
> bool
> -intelEmitImmediateColorExpandBlit(struct brw_context *brw,
> - GLuint cpp,
> - GLubyte *src_bits, GLuint src_size,
> - GLuint fg_color,
> - GLshort dst_pitch,
> - drm_intel_bo *dst_buffer,
> - GLuint dst_offset,
> - uint32_t dst_tiling,
> - GLshort x, GLshort y,
> - GLshort w, GLshort h,
> - GLenum logic_op);
> +intel_emit_immediate_color_expand_blit(struct brw_context *brw,
> + GLuint cpp,
> + GLubyte *src_bits, GLuint src_size,
> + GLuint fg_color,
> + GLshort dst_pitch,
> + drm_intel_bo *dst_buffer,
> + GLuint dst_offset,
> + uint32_t dst_tiling,
> + GLshort x, GLshort y,
> + GLshort w, GLshort h,
> + GLenum logic_op);
> +
> void intel_emit_linear_blit(struct brw_context *brw,
> drm_intel_bo *dst_bo,
> unsigned int dst_offset,
> diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c
> index 341220c..7000723 100644
> --- a/src/mesa/drivers/dri/i965/intel_copy_image.c
> +++ b/src/mesa/drivers/dri/i965/intel_copy_image.c
> @@ -58,9 +58,9 @@ copy_image_with_blitter(struct brw_context *brw,
> * represented per scan line’s worth of graphics data depends on the
> * color depth.
> *
> - * Furthermore, intelEmitCopyBlit (which is called below) uses a signed
> - * 16-bit integer to represent buffer pitch, so it can only handle buffer
> - * pitches < 32k.
> + * Furthermore, intel_emit_copy_blit (which is called below) uses a
> + * signed 16-bit integer to represent buffer pitch, so it can only
> + * handle buffer pitches < 32k.
> *
> * As a result of these two limitations, we can only use the blitter to do
> * this copy when the miptree's pitch is less than 32k.
> @@ -121,18 +121,18 @@ copy_image_with_blitter(struct brw_context *brw,
> dst_x += dst_image_x;
> dst_y += dst_image_y;
>
> - return intelEmitCopyBlit(brw,
> - cpp,
> - src_mt->pitch,
> - src_mt->bo, src_mt->offset,
> - src_mt->tiling,
> - dst_mt->pitch,
> - dst_mt->bo, dst_mt->offset,
> - dst_mt->tiling,
> - src_x, src_y,
> - dst_x, dst_y,
> - src_width, src_height,
> - GL_COPY);
> + return intel_emit_copy_blit(brw,
> + cpp,
> + src_mt->pitch,
> + src_mt->bo, src_mt->offset,
> + src_mt->tiling,
> + dst_mt->pitch,
> + dst_mt->bo, dst_mt->offset,
> + dst_mt->tiling,
> + src_x, src_y,
> + dst_x, dst_y,
> + src_width, src_height,
> + GL_COPY);
> }
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> index 1b3f952..a510205 100644
> --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
> @@ -291,19 +291,19 @@ do_blit_bitmap( struct gl_context *ctx,
> if (count == 0)
> continue;
>
> - if (!intelEmitImmediateColorExpandBlit(brw,
> - irb->mt->cpp,
> - (GLubyte *)stipple,
> - sz,
> - color,
> - irb->mt->pitch,
> - irb->mt->bo,
> - 0,
> - irb->mt->tiling,
> - dstx + px,
> - dsty + py,
> - w, h,
> - logic_op)) {
> + if (!intel_emit_immediate_color_expand_blit(brw,
> + irb->mt->cpp,
> + (GLubyte *)stipple,
> + sz,
> + color,
> + irb->mt->pitch,
> + irb->mt->bo,
> + 0,
> + irb->mt->tiling,
> + dstx + px,
> + dsty + py,
> + w, h,
> + logic_op)) {
> return false;
> }
>
>
More information about the mesa-dev
mailing list