diff options
| author | Brian <[email protected]> | 2007-06-21 09:15:32 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-06-21 09:15:32 -0600 |
| commit | 171dcdfa27dda30916a7f9bfed89577feee5d350 (patch) | |
| tree | 88624d960231df741ceaa2e5ed2005ebb97d7e22 /src/mesa/drivers/dri/i915tex/intel_pixel_draw.c | |
| parent | fe11b2c04bf206bd50654c31e6789519c6c07563 (diff) | |
Another round of fixing attribute interpolation for glDraw/CopyPixels.
Need to turn off FRAG_BIT_COL0 in swrast->_ActiveAttribMask when doing
glRead/CopyPixels to prevent the user's colors from getting overwritten
when a fragment program is active.
This was happening in the DRI drivers when MaintainTexEnv program was
used (the texenv fragment program was enabled when _swrast_DrawPixels was
called).
This still isn't an ideal solution, but fixes things for now.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_pixel_draw.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_pixel_draw.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c b/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c index 46480da1b12..77c67c821eb 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c @@ -363,9 +363,12 @@ intelDrawPixels(GLcontext * ctx, if (INTEL_DEBUG & DEBUG_PIXEL) _mesa_printf("%s: fallback to swrast\n", __FUNCTION__); - if (ctx->FragmentProgram._Current == - ctx->FragmentProgram._TexEnvProgram) { - /* don't want the i915 texenv program to be applied to DrawPixels */ + if (ctx->FragmentProgram._Current == ctx->FragmentProgram._TexEnvProgram) { + /* + * We don't want the i915 texenv program to be applied to DrawPixels. + * This is really just a performance optimization (mesa will other- + * wise happily run the fragment program on each pixel in the image). + */ struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current; ctx->FragmentProgram._Current = NULL; _swrast_DrawPixels( ctx, x, y, width, height, format, type, |