fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix segfault with i915 drivers in swrast drawpixels path when resizing windows

Browse source
This commit is contained in:
Roland Scheidegger 2007-07-16 18:09:30 +02:00
parent d895c5a08f
commit fb3b9060d4
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i915/intel_pixel.c
View file

@ -450,10 +450,16 @@ intelDrawPixels( GLcontext *ctx,
* wise happily run the fragment program on each pixel in the image). * wise happily run the fragment program on each pixel in the image).
*/ */
struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current; struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current;
/* can't just set current frag prog to 0 here as on buffer resize
we'll get new state checks which will segfault. Remains a hack. */
ctx->FragmentProgram._Current = NULL; ctx->FragmentProgram._Current = NULL;
ctx->FragmentProgram._UseTexEnvProgram = GL_FALSE;
ctx->FragmentProgram._Active = GL_FALSE;
_swrast_DrawPixels( ctx, x, y, width, height, format, type, _swrast_DrawPixels( ctx, x, y, width, height, format, type,
unpack, pixels ); unpack, pixels );
ctx->FragmentProgram._Current = fpSave; ctx->FragmentProgram._Current = fpSave;
ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
ctx->FragmentProgram._Active = GL_TRUE;
} }
else { else {
_swrast_DrawPixels( ctx, x, y, width, height, format, type, _swrast_DrawPixels( ctx, x, y, width, height, format, type,

6
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
View file

@ -370,10 +370,16 @@ intelDrawPixels(GLcontext * ctx,
* wise happily run the fragment program on each pixel in the image). * wise happily run the fragment program on each pixel in the image).
*/ */
struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current; struct gl_fragment_program *fpSave = ctx->FragmentProgram._Current;
/* can't just set current frag prog to 0 here as on buffer resize
we'll get new state checks which will segfault. Remains a hack. */
ctx->FragmentProgram._Current = NULL; ctx->FragmentProgram._Current = NULL;
ctx->FragmentProgram._UseTexEnvProgram = GL_FALSE;
ctx->FragmentProgram._Active = GL_FALSE;
_swrast_DrawPixels( ctx, x, y, width, height, format, type, _swrast_DrawPixels( ctx, x, y, width, height, format, type,
unpack, pixels ); unpack, pixels );
ctx->FragmentProgram._Current = fpSave; ctx->FragmentProgram._Current = fpSave;
ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
ctx->FragmentProgram._Active = GL_TRUE;
} }
else { else {
_swrast_DrawPixels( ctx, x, y, width, height, format, type, _swrast_DrawPixels( ctx, x, y, width, height, format, type,