diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
| commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
| tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | |
| parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
| parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) | |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
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 5841afaa3e..421fcc5e51 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); } } } |