Attachment 10397 Details for Bug 11133 – i965-bitmap-logicop.diff

[patch] i965-bitmap-logicop.diff

i965-bitmap-logicop.diff (text/plain), 2.62 KB, created by Eric Anholt on 2007-06-21 16:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Anholt

Created: 2007-06-21 16:50:09 UTC

Size: 2.62 KB

patch

obsolete

># Not currently on any branch.
># Changes to be committed:
>#   (use "git reset HEAD <file>..." to unstage)
>#
>#	modified:   src/mesa/drivers/dri/i965/intel_blit.c
>#	modified:   src/mesa/drivers/dri/i965/intel_blit.h
>#	modified:   src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
>#
>diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
>index 173d1d5..f88cbb2 100644
>--- a/src/mesa/drivers/dri/i965/intel_blit.c
>+++ b/src/mesa/drivers/dri/i965/intel_blit.c
>@@ -532,12 +532,15 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel,
> 				  GLuint dst_offset,
> 				  GLboolean dst_tiled,
> 				  GLshort x, GLshort y, 
>-				  GLshort w, GLshort h)
>+				  GLshort w, GLshort h,
>+				  GLenum logic_op)
> {
>    struct xy_setup_blit setup;
>    struct xy_text_immediate_blit text;
>    int dwords = ((src_size + 7) & ~7) / 4;
> 
>+   assert( logic_op - GL_CLEAR >= 0 );
>+   assert( logic_op - GL_CLEAR < 0x10 );
> 
>    if (w < 0 || h < 0) 
>       return;
>@@ -561,7 +564,7 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel,
>    setup.br0.length = (sizeof(setup) / sizeof(int)) - 2;
>       
>    setup.br13.dest_pitch = dst_pitch;
>-   setup.br13.rop = 0xcc;
>+   setup.br13.rop = translate_raster_op(logic_op);
>    setup.br13.color_depth = (cpp == 4) ? BR13_8888 : BR13_565;
>    setup.br13.clipping_enable = 0;
>    setup.br13.mono_source_transparency = 1;
>diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/intel_blit.h
>index 8b0cc65..e361545 100644
>--- a/src/mesa/drivers/dri/i965/intel_blit.h
>+++ b/src/mesa/drivers/dri/i965/intel_blit.h
>@@ -72,6 +72,7 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel,
> 				  GLuint dst_offset,
> 				  GLboolean dst_tiled,
> 				  GLshort dst_x, GLshort dst_y, 
>-				  GLshort w, GLshort h);
>+				  GLshort w, GLshort h,
>+				  GLenum logic_op );
> 
> #endif
>diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
>index 5841afa..421fcc5 100644
>--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
>+++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
>@@ -260,7 +260,9 @@ do_blit_bitmap( GLcontext *ctx,
> 	       int h = MIN2(DY, box_h - py);
> 	       int w = MIN2(DX, box_w - px); 
> 	       GLuint sz = align(align(w,8) * h, 64)/8;
>-	    
>+	       GLenum logic_op = ctx->Color.ColorLogicOpEnabled ?
>+		  ctx->Color.LogicOp : GL_COPY;
>+
> 	       assert(sz <= sizeof(stipple));
> 	       memset(stipple, 0, sz);
> 
>@@ -288,7 +290,8 @@ do_blit_bitmap( GLcontext *ctx,
> 						  dst->tiled,
> 						  rect.x1 + px,
> 						  rect.y2 - (py + h),
>-						  w, h);
>+						  w, h,
>+						  logic_op);
> 	    } 
> 	 } 
>       }

Actions: View | Splinter Review

Attachments on bug 11133: 10170 | 10397

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.