AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Clean up bad code formatting left from previous commit

Browse Source 
Also s/_EXT// on enums that are now part of core.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick
2013-11-13 14:15:11 -08:00
parent a92b9e60ab
commit 4949322462
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/fbobject.c
+9 -11
View File
@@ -782,7 +782,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format,
/* OK */
}
else if (ctx->Extensions.ARB_depth_texture &&
baseFormat == GL_DEPTH_STENCIL_EXT) {
baseFormat == GL_DEPTH_STENCIL) {
/* OK */
}
else {
@@ -794,7 +794,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format,
else {
ASSERT(format == GL_STENCIL);
if (ctx->Extensions.ARB_depth_texture &&
baseFormat == GL_DEPTH_STENCIL_EXT) {
baseFormat == GL_DEPTH_STENCIL) {
/* OK */
}
else {
@@ -828,7 +828,7 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format,
if (baseFormat == GL_DEPTH_COMPONENT) {
/* OK */
}
else if (baseFormat == GL_DEPTH_STENCIL_EXT) {
else if (baseFormat == GL_DEPTH_STENCIL) {
/* OK */
}
else {
@@ -839,10 +839,8 @@ test_attachment_completeness(const struct gl_context *ctx, GLenum format,
}
else {
assert(format == GL_STENCIL);
if (baseFormat == GL_STENCIL_INDEX) {
/* OK */
}
else if (baseFormat == GL_DEPTH_STENCIL_EXT) {
if (baseFormat == GL_STENCIL_INDEX ||
baseFormat == GL_DEPTH_STENCIL) {
/* OK */
}
else {
@@ -1453,10 +1451,10 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT24:
return GL_DEPTH_COMPONENT;
case GL_DEPTH_STENCIL_EXT:
return _mesa_is_desktop_gl(ctx) ? GL_DEPTH_STENCIL_EXT : 0;
case GL_DEPTH24_STENCIL8_EXT:
return GL_DEPTH_STENCIL_EXT;
case GL_DEPTH_STENCIL:
return _mesa_is_desktop_gl(ctx) ? GL_DEPTH_STENCIL : 0;
case GL_DEPTH24_STENCIL8:
return GL_DEPTH_STENCIL;
case GL_DEPTH_COMPONENT32F:
return ctx->Version >= 30
|| (ctx->API == API_OPENGL_COMPAT && ctx->Extensions.ARB_depth_buffer_float)
src/mesa/main/glformats.c
+1 -1
View File
@@ -1481,7 +1481,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
else
return GL_INVALID_OPERATION;
case GL_DEPTH_STENCIL_EXT:
case GL_DEPTH_STENCIL:
if (type == GL_UNSIGNED_INT_24_8)
return GL_NO_ERROR;
else if (ctx->Extensions.ARB_depth_buffer_float &&
src/mesa/main/teximage.c
+7 -7
View File
@@ -301,13 +301,13 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
}
}
switch (internalFormat) {
case GL_DEPTH_STENCIL_EXT:
case GL_DEPTH24_STENCIL8_EXT:
return GL_DEPTH_STENCIL_EXT;
default:
; /* fallthrough */
}
switch (internalFormat) {
case GL_DEPTH_STENCIL:
case GL_DEPTH24_STENCIL8:
return GL_DEPTH_STENCIL;
default:
; /* fallthrough */
}
if (ctx->Extensions.EXT_texture_sRGB) {
switch (internalFormat) {
src/mesa/main/texparam.c
+1 -1
View File
@@ -1162,7 +1162,7 @@ get_tex_level_parameter_image(struct gl_context *ctx,
goto invalid_pname;
*params = _mesa_get_format_bits(texFormat, pname);
break;
case GL_TEXTURE_STENCIL_SIZE_EXT:
case GL_TEXTURE_STENCIL_SIZE:
*params = _mesa_get_format_bits(texFormat, pname);
break;
case GL_TEXTURE_SHARED_SIZE: