fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meta: Fix invalid PBO access from DrawPixels when trying to just alloc.

Browse source 
This whole reuse of buffers (TexSubImage instead of TexImage, SubData
instead of Data) is bad for hardware drivers, but it's even worse when
we accidentally try to access the 2x2 PBO to fill the new 16x16 texture
we're creating, producing GL errors.

Fixes piglit pbo-drawpixels.  Bug #14163.
This commit is contained in:
Eric Anholt 2009-09-28 14:03:40 -07:00
parent e885cb48a0
commit d492e7b017
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/drivers/common/meta.c
View file

@ -974,7 +974,8 @@ setup_copypix_texture(struct temp_texture *tex,
* Setup/load texture for glDrawPixels. * Setup/load texture for glDrawPixels.
*/ */
static void static void
setup_drawpix_texture(struct temp_texture *tex, setup_drawpix_texture(GLcontext *ctx,
struct temp_texture *tex,
GLboolean newTex, GLboolean newTex,
GLenum texIntFormat, GLenum texIntFormat,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
@ -995,9 +996,17 @@ setup_drawpix_texture(struct temp_texture *tex,
tex->Width, tex->Height, 0, format, type, pixels); tex->Width, tex->Height, 0, format, type, pixels);
} }
else { else {
struct gl_buffer_object *save_unpack_obj = NULL;
_mesa_reference_buffer_object(ctx, &save_unpack_obj,
ctx->Unpack.BufferObj);
_mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
/* create empty texture */ /* create empty texture */
_mesa_TexImage2D(tex->Target, 0, tex->IntFormat, _mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
tex->Width, tex->Height, 0, format, type, NULL); tex->Width, tex->Height, 0, format, type, NULL);
if (save_unpack_obj != NULL)
_mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB,
save_unpack_obj->Name);
/* load image */ /* load image */
_mesa_TexSubImage2D(tex->Target, 0, _mesa_TexSubImage2D(tex->Target, 0,
0, 0, width, height, format, type, pixels); 0, 0, width, height, format, type, pixels);
@ -1162,7 +1171,7 @@ _mesa_meta_BlitFramebuffer(GLcontext *ctx,
_mesa_ReadPixels(srcX, srcY, srcW, srcH, _mesa_ReadPixels(srcX, srcY, srcW, srcH,
GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
setup_drawpix_texture(tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH, setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH,
GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
@ -1725,7 +1734,7 @@ _mesa_meta_DrawPixels(GLcontext *ctx,
if (!drawpix->StencilFP) if (!drawpix->StencilFP)
init_draw_stencil_pixels(ctx); init_draw_stencil_pixels(ctx);
setup_drawpix_texture(tex, newTex, texIntFormat, width, height, setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
GL_ALPHA, type, pixels); GL_ALPHA, type, pixels);
_mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
@ -1768,14 +1777,14 @@ _mesa_meta_DrawPixels(GLcontext *ctx,
_mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0,
ctx->Current.RasterColor); ctx->Current.RasterColor);
setup_drawpix_texture(tex, newTex, texIntFormat, width, height, setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
format, type, pixels); format, type, pixels);
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
} }
else { else {
/* Drawing RGBA */ /* Drawing RGBA */
setup_drawpix_texture(tex, newTex, texIntFormat, width, height, setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
format, type, pixels); format, type, pixels);
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
} }
@ -1923,7 +1932,7 @@ _mesa_meta_Bitmap(GLcontext *ctx,
_mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE); _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE);
_mesa_AlphaFunc(GL_GREATER, 0.0); _mesa_AlphaFunc(GL_GREATER, 0.0);
setup_drawpix_texture(tex, newTex, texIntFormat, width, height, setup_drawpix_texture(ctx, tex, newTex, texIntFormat, width, height,
GL_ALPHA, GL_UNSIGNED_BYTE, bitmap8); GL_ALPHA, GL_UNSIGNED_BYTE, bitmap8);
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);