diff options
author | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
commit | f6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch) | |
tree | 706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | |
parent | a42dac187973cbc17be6c59db89264cbc935ab91 (diff) | |
parent | 5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff) |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel_bitmap.c')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 4cb68655f2..81238acfe4 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -194,7 +194,7 @@ do_blit_bitmap( GLcontext *ctx, /* Does zoom apply to bitmaps? */ - if (!intel_check_blit_fragment_ops(ctx) || + if (!intel_check_blit_fragment_ops(ctx, tmpColor[3] == 1.0F) || ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F) return GL_FALSE; |