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

Merge commit 'origin/gallium-0.1' into gallium-0.2

Browse source 
Conflicts:

	progs/trivial/tri.c
This commit is contained in:
Brian Paul 2008-10-17 14:13:00 -06:00
commit 87a6fe57e8
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
progs/trivial/tri.c
View file

@ -57,16 +57,13 @@ static void Reshape(int width, int height)
static void Key(unsigned char key, int x, int y)
{
switch (key) {
case 27:
glutDestroyWindow(win);
exit(0);
default:
return;
}
glutPostRedisplay();
switch (key) {
case 27:
exit(0);
default:
glutPostRedisplay();
return;
}
}
static void Draw(void)

4
src/mesa/state_tracker/st_cb_texture.c
View file

@ -156,7 +156,7 @@ st_FreeTextureImageData(GLcontext * ctx, struct gl_texture_image *texImage)
}
if (texImage->Data) {
free(texImage->Data);
_mesa_align_free(texImage->Data);
texImage->Data = NULL;
}
}
@ -541,7 +541,7 @@ st_TexImage(GLcontext * ctx,
sizeInBytes = depth * dstRowStride * postConvHeight;
}
texImage->Data = malloc(sizeInBytes);
texImage->Data = _mesa_align_malloc(sizeInBytes, 16);
}
if (!texImage->Data) {