diff options
author | Eric Anholt <eric@anholt.net> | 2007-07-04 07:37:14 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-04 07:37:14 -0600 |
commit | bd9db5eed2cca6cd394c88adf09c70204be9da33 (patch) | |
tree | 37be845b0d3ad82f6b36e344ba0ac882b71e2ae2 /src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | |
parent | 22b0b2f47e36f66dd8f332d922c4b1c8672dbe70 (diff) |
fix LogicOp/bitmap problem, bug 11133
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_pixel_bitmap.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c index 5841afaa3ef..421fcc5e511 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); } } } |