OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't test for NULL pixels pointer here, do that in the 'store' routines after validating PBO address

Browse Source
This commit is contained in:
Brian Paul
2004-09-23 17:34:52 +00:00
parent 1fd4a55d09
commit 529e0a98d4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/main/teximage.c
View File

@@ -1979,6 +1979,9 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
return; return;
} }
/*
* XXX Move this code into a new driver fall-back function
*/
{ {
const GLint width = texImage->Width; const GLint width = texImage->Width;
const GLint height = texImage->Height; const GLint height = texImage->Height;
@@ -2396,7 +2399,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
texImage = _mesa_select_tex_image(ctx, texUnit, target, level); texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
assert(texImage); assert(texImage);
if (width == 0 || !pixels) if (width == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
/* If we have a border, xoffset=-1 is legal. Bias by border width */ /* If we have a border, xoffset=-1 is legal. Bias by border width */
@@ -2443,7 +2446,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
texImage = _mesa_select_tex_image(ctx, texUnit, target, level); texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
assert(texImage); assert(texImage);
if (width == 0 || height == 0 || !pixels) if (width == 0 || height == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
/* If we have a border, xoffset=-1 is legal. Bias by border width */ /* If we have a border, xoffset=-1 is legal. Bias by border width */
@@ -2485,7 +2488,7 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
texImage = _mesa_select_tex_image(ctx, texUnit, target, level); texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
assert(texImage); assert(texImage);
if (width == 0 || height == 0 || height == 0 || !pixels) if (width == 0 || height == 0 || height == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
/* If we have a border, xoffset=-1 is legal. Bias by border width */ /* If we have a border, xoffset=-1 is legal. Bias by border width */
@@ -3195,7 +3198,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
return; return;
} }
if (width == 0 || !data) if (width == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
if (ctx->Driver.CompressedTexSubImage1D) { if (ctx->Driver.CompressedTexSubImage1D) {
@@ -3246,7 +3249,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
return; return;
} }
if (width == 0 || height == 0 || !data) if (width == 0 || height == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
if (ctx->Driver.CompressedTexSubImage2D) { if (ctx->Driver.CompressedTexSubImage2D) {
@@ -3297,7 +3300,7 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
return; return;
} }
if (width == 0 || height == 0 || depth == 0 || !data) if (width == 0 || height == 0 || depth == 0)
return; /* no-op, not an error */ return; /* no-op, not an error */
if (ctx->Driver.CompressedTexSubImage3D) { if (ctx->Driver.CompressedTexSubImage3D) {