fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-26 06:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'mesa_7_6_branch'

Browse source
This commit is contained in:
Brian Paul 2009-10-28 18:27:25 -06:00
commit 0ea575d721
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/intel/intel_fbo.c
View file

@ -385,6 +385,7 @@ intel_create_renderbuffer(GLenum intFormat)
default:
_mesa_problem(NULL,
"Unexpected intFormat in intel_create_renderbuffer");
_mesa_free(irb);
return NULL;
}

6
src/mesa/main/texstore.c
View file

@ -587,8 +587,12 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
/* unpack and transfer the source image */
tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
* components * sizeof(GLchan));
if (!tempImage)
if (!tempImage) {
if (freeSrcImage) {
_mesa_free((void *) srcAddr);
}
return NULL;
}
dst = tempImage;
for (img = 0; img < srcDepth; img++) {