diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2006-11-21 10:43:16 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2006-11-21 10:43:16 +0000 |
commit | 46c04525d2282fc7fb5632de8348fef379c71120 (patch) | |
tree | 822a5f987aafb781e7b444348a8dd37b8a308df6 /src/mesa/drivers/dri/i965/intel_pixel_copy.c | |
parent | f58ec215c5669f36c2649acc9cbeda7383b86879 (diff) |
Gary Wong's patches for CopyPixels Logiop (enable) and Blend
(disallow). Slightly cleaned to disallow on all blend states for code
consiseness and turn a table lookup into a function to match other
code in the driver.
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_pixel_copy.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_copy.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c index d5d4899452..55b58a8f67 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c @@ -92,9 +92,9 @@ intel_check_blit_fragment_ops(GLcontext * ctx) !ctx->Color.ColorMask[1] || !ctx->Color.ColorMask[2] || !ctx->Color.ColorMask[3] || /* can do this! */ - ctx->Color.ColorLogicOpEnabled || /* can do this! */ ctx->Texture._EnabledUnits || - ctx->FragmentProgram._Enabled); + ctx->FragmentProgram._Enabled || + ctx->Color.BlendEnabled); } @@ -210,7 +210,9 @@ do_blit_copypixels(GLcontext * ctx, rect.x1 + delta_x, rect.y1 + delta_y, /* srcx, srcy */ rect.x1, rect.y1, /* dstx, dsty */ - rect.x2 - rect.x1, rect.y2 - rect.y1); + rect.x2 - rect.x1, rect.y2 - rect.y1, + ctx->Color.ColorLogicOpEnabled ? + ctx->Color.LogicOp : GL_COPY); } intel->need_flush = GL_TRUE; |