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

mesa: remove last of gotos

Browse Source
This commit is contained in:
Brian Paul
2009-09-15 17:41:40 -06:00
parent c352566933
commit a31ac84d74
1 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2474,11 +2474,11 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
texImage = _mesa_select_tex_image(ctx, texObj, target, level); texImage = _mesa_select_tex_image(ctx, texObj, target, level);
if (subtexture_error_check2(ctx, 1, target, level, xoffset, 0, 0, if (subtexture_error_check2(ctx, 1, target, level, xoffset, 0, 0,
postConvWidth, 1, 1, format, type, texImage)) { postConvWidth, 1, 1,
goto out; /* error was detected */ format, type, texImage)) {
/* error was recorded */
} }
else if (width > 0) {
if (width > 0) {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
@@ -2489,7 +2489,6 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
} }
out:
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }
@@ -2526,17 +2525,17 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
texUnit = _mesa_get_current_tex_unit(ctx); texUnit = _mesa_get_current_tex_unit(ctx);
texObj = _mesa_select_tex_object(ctx, texUnit, target); texObj = _mesa_select_tex_object(ctx, texUnit, target);
_mesa_lock_texture(ctx, texObj); _mesa_lock_texture(ctx, texObj);
{ {
texImage = _mesa_select_tex_image(ctx, texObj, target, level); texImage = _mesa_select_tex_image(ctx, texObj, target, level);
if (subtexture_error_check2(ctx, 2, target, level, xoffset, yoffset, 0, if (subtexture_error_check2(ctx, 2, target, level, xoffset, yoffset, 0,
postConvWidth, postConvHeight, 1, format, type, postConvWidth, postConvHeight, 1,
texImage)) { format, type, texImage)) {
goto out; /* error was detected */ /* error was recorded */
} }
else if (width > 0 && height >= 0) {
if (width > 0 && height >= 0) {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
yoffset += texImage->Border; yoffset += texImage->Border;
@@ -2548,7 +2547,6 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
} }
out:
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }
@@ -2582,12 +2580,13 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
{ {
texImage = _mesa_select_tex_image(ctx, texObj, target, level); texImage = _mesa_select_tex_image(ctx, texObj, target, level);
if (subtexture_error_check2(ctx, 3, target, level, xoffset, yoffset, zoffset, if (subtexture_error_check2(ctx, 3, target, level,
width, height, depth, format, type, texImage)) { xoffset, yoffset, zoffset,
goto out; /* error was detected */ width, height, depth,
format, type, texImage)) {
/* error was recorded */
} }
else if (width > 0 && height > 0 && height > 0) {
if (width > 0 && height > 0 && height > 0) {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
yoffset += texImage->Border; yoffset += texImage->Border;
@@ -2602,7 +2601,6 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
} }
out:
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }
@@ -2637,6 +2635,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
texUnit = _mesa_get_current_tex_unit(ctx); texUnit = _mesa_get_current_tex_unit(ctx);
texObj = _mesa_select_tex_object(ctx, texUnit, target); texObj = _mesa_select_tex_object(ctx, texUnit, target);
_mesa_lock_texture(ctx, texObj); _mesa_lock_texture(ctx, texObj);
{ {
texImage = _mesa_get_tex_image(ctx, texObj, target, level); texImage = _mesa_get_tex_image(ctx, texObj, target, level);
@@ -2773,10 +2772,10 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
if (copytexsubimage_error_check2(ctx, 1, target, level, if (copytexsubimage_error_check2(ctx, 1, target, level,
xoffset, 0, 0, postConvWidth, 1, xoffset, 0, 0, postConvWidth, 1,
texImage)) texImage)) {
goto out; /* error was recorded */
}
else {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
@@ -2785,11 +2784,10 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
ASSERT(ctx->Driver.CopyTexSubImage1D); ASSERT(ctx->Driver.CopyTexSubImage1D);
ctx->Driver.CopyTexSubImage1D(ctx, target, level, ctx->Driver.CopyTexSubImage1D(ctx, target, level,
xoffset, x, y, width); xoffset, x, y, width);
}
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
out: }
}
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }
@@ -2827,10 +2825,13 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
} }
#endif #endif
if (copytexsubimage_error_check2(ctx, 2, target, level, xoffset, yoffset, 0, if (copytexsubimage_error_check2(ctx, 2, target, level,
postConvWidth, postConvHeight, texImage)) xoffset, yoffset, 0,
goto out; postConvWidth, postConvHeight,
texImage)) {
/* error was recorded */
}
else {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
yoffset += texImage->Border; yoffset += texImage->Border;
@@ -2838,13 +2839,12 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y, if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
&width, &height)) { &width, &height)) {
ASSERT(ctx->Driver.CopyTexSubImage2D); ASSERT(ctx->Driver.CopyTexSubImage2D);
ctx->Driver.CopyTexSubImage2D(ctx, target, level, ctx->Driver.CopyTexSubImage2D(ctx, target, level, xoffset, yoffset,
xoffset, yoffset, x, y, width, height); x, y, width, height);
}
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
out: }
}
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }
@@ -2884,9 +2884,10 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
if (copytexsubimage_error_check2(ctx, 3, target, level, xoffset, yoffset, if (copytexsubimage_error_check2(ctx, 3, target, level, xoffset, yoffset,
zoffset, postConvWidth, postConvHeight, zoffset, postConvWidth, postConvHeight,
texImage)) texImage)) {
goto out; /* error was recored */
}
else {
/* 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 */
xoffset += texImage->Border; xoffset += texImage->Border;
yoffset += texImage->Border; yoffset += texImage->Border;
@@ -2898,11 +2899,10 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
ctx->Driver.CopyTexSubImage3D(ctx, target, level, ctx->Driver.CopyTexSubImage3D(ctx, target, level,
xoffset, yoffset, zoffset, xoffset, yoffset, zoffset,
x, y, width, height); x, y, width, height);
}
ctx->NewState |= _NEW_TEXTURE; ctx->NewState |= _NEW_TEXTURE;
} }
out: }
}
_mesa_unlock_texture(ctx, texObj); _mesa_unlock_texture(ctx, texObj);
} }