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

src/mesa: update fallthrough comments

Browse Source 
clang doesn't support /* fallthrough */ so switch to fallthrough
attribute.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7747>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2020-11-24 11:04:00 +01:00
parent 9b3e6014a9
commit a2aa777b68
23 changed files with 141 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/condrender.c
View File

@@ -73,7 +73,7 @@ begin_conditional_render(struct gl_context *ctx, GLuint queryId, GLenum mode,
case GL_QUERY_BY_REGION_NO_WAIT_INVERTED:
if (ctx->Extensions.ARB_conditional_render_inverted)
break; /* OK */
/* fallthrough - invalid */
FALLTHROUGH;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",
_mesa_enum_to_string(mode));

2
src/mesa/main/context.c
View File

@@ -1267,7 +1267,7 @@ _mesa_initialize_context(struct gl_context *ctx,
if (!ctx->BeginEnd || !ctx->Save)
goto fail;
/* fall-through */
FALLTHROUGH;
case API_OPENGL_CORE:
break;
case API_OPENGLES:

4
src/mesa/main/fbobject.c
View File

@@ -299,7 +299,7 @@ get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
case GL_DEPTH_STENCIL_ATTACHMENT:
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
return NULL;
/* fall-through */
FALLTHROUGH;
case GL_DEPTH_ATTACHMENT_EXT:
return &fb->Attachment[BUFFER_DEPTH];
case GL_STENCIL_ATTACHMENT_EXT:
@@ -5039,7 +5039,7 @@ invalidate_framebuffer_storage(struct gl_context *ctx,
*/
if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx))
break;
/* fallthrough */
FALLTHROUGH;
case GL_COLOR_ATTACHMENT0:
case GL_COLOR_ATTACHMENT1:
case GL_COLOR_ATTACHMENT2:

12
src/mesa/main/formatquery.c
View File

@@ -144,7 +144,7 @@ _legal_parameters(struct gl_context *ctx, GLenum target, GLenum internalformat,
_mesa_enum_to_string(pname));
return false;
}
/* fallthrough */
FALLTHROUGH;
case GL_INTERNALFORMAT_SUPPORTED:
case GL_INTERNALFORMAT_PREFERRED:
case GL_INTERNALFORMAT_RED_SIZE:
@@ -883,7 +883,7 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
switch (pname) {
case GL_SAMPLES:
/* fall-through */
FALLTHROUGH;
case GL_NUM_SAMPLE_COUNTS:
/* The ARB_internalformat_query2 sets the response as 'unsupported' for
* SAMPLES and NUM_SAMPLE_COUNTS:
@@ -995,7 +995,7 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
target != GL_RENDERBUFFER &&
target != GL_TEXTURE_BUFFER)
goto end;
/* fallthrough */
FALLTHROUGH;
case GL_INTERNALFORMAT_RED_SIZE:
case GL_INTERNALFORMAT_GREEN_SIZE:
case GL_INTERNALFORMAT_BLUE_SIZE:
@@ -1007,7 +1007,7 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
case GL_INTERNALFORMAT_DEPTH_TYPE:
if (!_mesa_has_ARB_texture_float(ctx))
goto end;
/* fallthrough */
FALLTHROUGH;
case GL_INTERNALFORMAT_RED_TYPE:
case GL_INTERNALFORMAT_GREEN_TYPE:
case GL_INTERNALFORMAT_BLUE_TYPE:
@@ -1159,7 +1159,7 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
if (!_mesa_has_EXT_texture_array(ctx) ||
_legal_target_for_framebuffer_texture_layer(ctx, target))
goto end;
/* fallthrough */
FALLTHROUGH;
case GL_FRAMEBUFFER_RENDERABLE:
case GL_FRAMEBUFFER_BLEND:
if (!_mesa_has_ARB_framebuffer_object(ctx))
@@ -1312,7 +1312,7 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
if (!_mesa_has_ARB_texture_gather(ctx))
goto end;
/* fallthrough */
FALLTHROUGH;
case GL_TEXTURE_SHADOW:
/* Only depth or depth-stencil image formats make sense in shadow
samplers */

172
src/mesa/main/get.c
View File

@@ -1731,19 +1731,19 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params)
params[6] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[6]);
params[5] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[5]);
params[4] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[4]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[0]);
@@ -1751,7 +1751,7 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params)
case TYPE_DOUBLEN_2:
params[1] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[0]);
break;
@@ -1759,16 +1759,16 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params)
case TYPE_INT_4:
case TYPE_UINT_4:
params[3] = INT_TO_BOOLEAN(((GLint *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
case TYPE_UINT_3:
params[2] = INT_TO_BOOLEAN(((GLint *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = INT_TO_BOOLEAN(((GLint *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_UINT:
case TYPE_ENUM:
@@ -1848,19 +1848,19 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params)
params[6] = ((GLfloat *) p)[6];
params[5] = ((GLfloat *) p)[5];
params[4] = ((GLfloat *) p)[4];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = ((GLfloat *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = ((GLfloat *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = ((GLfloat *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = ((GLfloat *) p)[0];
@@ -1868,21 +1868,21 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params)
case TYPE_DOUBLEN_2:
params[1] = (GLfloat) (((GLdouble *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = (GLfloat) (((GLdouble *) p)[0]);
break;
case TYPE_INT_4:
params[3] = (GLfloat) (((GLint *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
params[2] = (GLfloat) (((GLint *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_ENUM_2:
params[1] = (GLfloat) (((GLint *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_ENUM:
params[0] = (GLfloat) (((GLint *) p)[0]);
@@ -1899,13 +1899,13 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params)
case TYPE_UINT_4:
params[3] = (GLfloat) (((GLuint *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_3:
params[2] = (GLfloat) (((GLuint *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_2:
params[1] = (GLfloat) (((GLuint *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT:
params[0] = (GLfloat) (((GLuint *) p)[0]);
break;
@@ -1974,36 +1974,36 @@ _mesa_GetIntegerv(GLenum pname, GLint *params)
params[6] = lroundf(((GLfloat *) p)[6]);
params[5] = lroundf(((GLfloat *) p)[5]);
params[4] = lroundf(((GLfloat *) p)[4]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_4:
params[3] = lroundf(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
params[2] = lroundf(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
params[1] = lroundf(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
params[0] = lroundf(((GLfloat *) p)[0]);
break;
case TYPE_FLOATN_4:
params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN_3:
params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN_2:
params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN:
params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);
break;
case TYPE_DOUBLEN_2:
params[1] = FLOAT_TO_INT(((GLdouble *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);
break;
@@ -2011,16 +2011,16 @@ _mesa_GetIntegerv(GLenum pname, GLint *params)
case TYPE_INT_4:
case TYPE_UINT_4:
params[3] = ((GLint *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
case TYPE_UINT_3:
params[2] = ((GLint *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = ((GLint *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_UINT:
case TYPE_ENUM:
@@ -2100,50 +2100,50 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params)
params[6] = llround(((GLfloat *) p)[6]);
params[5] = llround(((GLfloat *) p)[5]);
params[4] = llround(((GLfloat *) p)[4]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_4:
params[3] = llround(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
params[2] = llround(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
params[1] = llround(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
params[0] = llround(((GLfloat *) p)[0]);
break;
case TYPE_FLOATN_4:
params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN_3:
params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN_2:
params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOATN:
params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);
break;
case TYPE_DOUBLEN_2:
params[1] = FLOAT_TO_INT(((GLdouble *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);
break;
case TYPE_INT_4:
params[3] = ((GLint *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
params[2] = ((GLint *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_ENUM_2:
params[1] = ((GLint *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_ENUM:
params[0] = ((GLint *) p)[0];
@@ -2160,13 +2160,13 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params)
case TYPE_UINT_4:
params[3] = ((GLuint *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_3:
params[2] = ((GLuint *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_2:
params[1] = ((GLuint *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT:
params[0] = ((GLuint *) p)[0];
break;
@@ -2227,19 +2227,19 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params)
params[6] = ((GLfloat *) p)[6];
params[5] = ((GLfloat *) p)[5];
params[4] = ((GLfloat *) p)[4];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = ((GLfloat *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = ((GLfloat *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = ((GLfloat *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = ((GLfloat *) p)[0];
@@ -2247,21 +2247,21 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params)
case TYPE_DOUBLEN_2:
params[1] = ((GLdouble *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = ((GLdouble *) p)[0];
break;
case TYPE_INT_4:
params[3] = ((GLint *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
params[2] = ((GLint *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_ENUM_2:
params[1] = ((GLint *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_ENUM:
params[0] = ((GLint *) p)[0];
@@ -2278,13 +2278,13 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params)
case TYPE_UINT_4:
params[3] = ((GLuint *) p)[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_3:
params[2] = ((GLuint *) p)[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_2:
params[1] = ((GLuint *) p)[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT:
params[0] = ((GLuint *) p)[0];
break;
@@ -2967,15 +2967,15 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = lroundf(v.value_float_4[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = lroundf(v.value_float_4[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = lroundf(v.value_float_4[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = lroundf(v.value_float_4[0]);
@@ -2983,7 +2983,7 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
case TYPE_DOUBLEN_2:
params[1] = lroundf(v.value_double_2[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = lroundf(v.value_double_2[0]);
break;
@@ -3054,15 +3054,15 @@ _mesa_GetFloati_v(GLenum pname, GLuint index, GLfloat *params)
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = v.value_float_4[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = v.value_float_4[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = v.value_float_4[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = v.value_float_4[0];
@@ -3070,21 +3070,21 @@ _mesa_GetFloati_v(GLenum pname, GLuint index, GLfloat *params)
case TYPE_DOUBLEN_2:
params[1] = (GLfloat) v.value_double_2[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = (GLfloat) v.value_double_2[0];
break;
case TYPE_INT_4:
params[3] = (GLfloat) v.value_int_4[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
params[2] = (GLfloat) v.value_int_4[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_ENUM_2:
params[1] = (GLfloat) v.value_int_4[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_ENUM:
case TYPE_ENUM16:
@@ -3098,13 +3098,13 @@ _mesa_GetFloati_v(GLenum pname, GLuint index, GLfloat *params)
case TYPE_UINT_4:
params[3] = (GLfloat) ((GLuint) v.value_int_4[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_3:
params[2] = (GLfloat) ((GLuint) v.value_int_4[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_2:
params[1] = (GLfloat) ((GLuint) v.value_int_4[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT:
params[0] = (GLfloat) ((GLuint) v.value_int_4[0]);
break;
@@ -3155,15 +3155,15 @@ _mesa_GetDoublei_v(GLenum pname, GLuint index, GLdouble *params)
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = (GLdouble) v.value_float_4[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = (GLdouble) v.value_float_4[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = (GLdouble) v.value_float_4[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = (GLdouble) v.value_float_4[0];
@@ -3171,21 +3171,21 @@ _mesa_GetDoublei_v(GLenum pname, GLuint index, GLdouble *params)
case TYPE_DOUBLEN_2:
params[1] = v.value_double_2[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = v.value_double_2[0];
break;
case TYPE_INT_4:
params[3] = (GLdouble) v.value_int_4[3];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
params[2] = (GLdouble) v.value_int_4[2];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_ENUM_2:
params[1] = (GLdouble) v.value_int_4[1];
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_ENUM:
case TYPE_ENUM16:
@@ -3199,13 +3199,13 @@ _mesa_GetDoublei_v(GLenum pname, GLuint index, GLdouble *params)
case TYPE_UINT_4:
params[3] = (GLdouble) ((GLuint) v.value_int_4[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_3:
params[2] = (GLdouble) ((GLuint) v.value_int_4[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT_2:
params[1] = (GLdouble) ((GLuint) v.value_int_4[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_UINT:
params[0] = (GLdouble) ((GLuint) v.value_int_4[0]);
break;
@@ -3320,15 +3320,15 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params)
case TYPE_FLOAT_4:
case TYPE_FLOATN_4:
params[3] = FLOAT_TO_FIXED(((GLfloat *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_3:
case TYPE_FLOATN_3:
params[2] = FLOAT_TO_FIXED(((GLfloat *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT_2:
case TYPE_FLOATN_2:
params[1] = FLOAT_TO_FIXED(((GLfloat *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_FLOAT:
case TYPE_FLOATN:
params[0] = FLOAT_TO_FIXED(((GLfloat *) p)[0]);
@@ -3336,7 +3336,7 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params)
case TYPE_DOUBLEN_2:
params[1] = FLOAT_TO_FIXED(((GLdouble *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_DOUBLEN:
params[0] = FLOAT_TO_FIXED(((GLdouble *) p)[0]);
break;
@@ -3344,16 +3344,16 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params)
case TYPE_INT_4:
case TYPE_UINT_4:
params[3] = INT_TO_FIXED(((GLint *) p)[3]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_3:
case TYPE_UINT_3:
params[2] = INT_TO_FIXED(((GLint *) p)[2]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT_2:
case TYPE_UINT_2:
case TYPE_ENUM_2:
params[1] = INT_TO_FIXED(((GLint *) p)[1]);
/* fallthrough */
FALLTHROUGH;
case TYPE_INT:
case TYPE_UINT:
case TYPE_ENUM:

12
src/mesa/main/glformats.c
View File

@@ -1236,7 +1236,7 @@ _mesa_is_color_format(GLenum format)
case GL_RGB10_A2UI:
return GL_TRUE;
case GL_YCBCR_MESA: /* not considered to be RGB */
/* fall-through */
FALLTHROUGH;
default:
return GL_FALSE;
}
@@ -1895,7 +1895,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
case GL_RED:
if (_mesa_has_rg_textures(ctx))
return GL_NO_ERROR;
/* fallthrough */
FALLTHROUGH;
default:
return GL_INVALID_OPERATION;
}
@@ -2190,7 +2190,7 @@ _mesa_es_error_check_format_and_type(const struct gl_context *ctx,
case GL_RG:
if (!_mesa_has_rg_textures(ctx))
return GL_INVALID_VALUE;
/* fallthrough */
FALLTHROUGH;
case GL_ALPHA:
case GL_LUMINANCE:
case GL_LUMINANCE_ALPHA:
@@ -2590,7 +2590,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
case GL_R32UI:
if (!_mesa_has_integer_textures(ctx))
break;
/* FALLTHROUGH */
FALLTHROUGH;
case GL_R8:
case GL_R16:
case GL_RED:
@@ -2613,7 +2613,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
case GL_RG32UI:
if (!_mesa_has_integer_textures(ctx))
break;
/* FALLTHROUGH */
FALLTHROUGH;
case GL_RG:
case GL_RG8:
case GL_RG16:
@@ -2744,7 +2744,7 @@ gles_effective_internal_format_for_format_and_type(GLenum format,
case GL_FLOAT:
if (format == GL_DEPTH_COMPONENT)
return GL_DEPTH_COMPONENT32F;
/* fall through */
FALLTHROUGH;
case GL_HALF_FLOAT_OES:
switch (format) {
case GL_RGBA:

11
src/mesa/main/macros.h
View File

@@ -307,10 +307,13 @@ COPY_4UBV(GLubyte dst[4], const GLubyte src[4])
#define COPY_SZ_4V(DST, SZ, SRC) \
do { \
switch (SZ) { \
case 4: (DST)[3] = (SRC)[3]; /* fallthrough */ \
case 3: (DST)[2] = (SRC)[2]; /* fallthrough */ \
case 2: (DST)[1] = (SRC)[1]; /* fallthrough */ \
case 1: (DST)[0] = (SRC)[0]; /* fallthrough */ \
case 4: (DST)[3] = (SRC)[3]; \
FALLTHROUGH; \
case 3: (DST)[2] = (SRC)[2]; \
FALLTHROUGH; \
case 2: (DST)[1] = (SRC)[1]; \
FALLTHROUGH; \
case 1: (DST)[0] = (SRC)[0]; \
} \
} while(0)

2
src/mesa/main/matrix.c
View File

@@ -87,7 +87,7 @@ get_named_matrix_stack(struct gl_context *ctx, GLenum mode, const char* caller)
if (m <= ctx->Const.MaxProgramMatrices)
return &ctx->ProgramMatrixStack[m];
}
/* fallthrough */
FALLTHROUGH;
default:
break;
}

2
src/mesa/main/polygon.c
View File

@@ -171,7 +171,7 @@ polygon_mode(struct gl_context *ctx, GLenum face, GLenum mode, bool no_error)
case GL_FILL_RECTANGLE_NV:
if (ctx->Extensions.NV_fill_rectangle)
break;
/* fall-through */
FALLTHROUGH;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glPolygonMode(mode)");
return;

4
src/mesa/main/queryobj.c
View File

@@ -228,7 +228,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index)
case GL_GEOMETRY_SHADER_INVOCATIONS:
/* GL_GEOMETRY_SHADER_INVOCATIONS is defined in a non-sequential order */
target = GL_VERTICES_SUBMITTED + MAX_PIPELINE_STATISTICS - 1;
/* fallthrough */
FALLTHROUGH;
case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED:
if (_mesa_has_geometry_shaders(ctx))
return get_pipe_stats_binding_point(ctx, target);
@@ -671,7 +671,7 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
case GL_QUERY_COUNTER_BITS:
if (_mesa_has_EXT_disjoint_timer_query(ctx))
break;
/* fallthrough */
FALLTHROUGH;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)",
_mesa_enum_to_string(pname));

8
src/mesa/main/texformat.c
View File

@@ -79,7 +79,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
} else if (type == GL_UNSIGNED_INT_2_10_10_10_REV) {
RETURN_IF_SUPPORTED(MESA_FORMAT_B10G10R10A2_UNORM);
}
/* fallthrough */
FALLTHROUGH;
case GL_RGBA8:
RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_UNORM);
@@ -121,7 +121,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
if (type == GL_UNSIGNED_SHORT_5_6_5) {
RETURN_IF_SUPPORTED(MESA_FORMAT_B5G6R5_UNORM);
}
/* fallthrough */
FALLTHROUGH;
case GL_RGB8:
RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UNORM8);
RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8X8_UNORM);
@@ -428,7 +428,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
case GL_RGB16_SNORM:
RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SNORM16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SNORM16);
/* FALLTHROUGH */
FALLTHROUGH;
case GL_RGBA16_SNORM:
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
@@ -442,7 +442,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
break;
case GL_LUMINANCE16_SNORM:
RETURN_IF_SUPPORTED(MESA_FORMAT_L_SNORM16);
/* FALLTHROUGH */
FALLTHROUGH;
case GL_LUMINANCE16_ALPHA16_SNORM:
RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SNORM16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);

2
src/mesa/main/texgetimage.c
View File

@@ -964,7 +964,7 @@ dimensions_error_check(struct gl_context *ctx,
"%s(1D, height = %d)", caller, height);
return true;
}
/* fall-through */
FALLTHROUGH;
case GL_TEXTURE_1D_ARRAY:
case GL_TEXTURE_2D:
case GL_TEXTURE_RECTANGLE:

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

@@ -1492,6 +1492,7 @@ _mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum target,
default:
break;
}
FALLTHROUGH;
default:
break;
}
@@ -3574,11 +3575,11 @@ texture_sub_image(struct gl_context *ctx, GLuint dims,
case 3:
if (target != GL_TEXTURE_2D_ARRAY)
zoffset += texImage->Border;
/* fall-through */
FALLTHROUGH;
case 2:
if (target != GL_TEXTURE_1D_ARRAY)
yoffset += texImage->Border;
/* fall-through */
FALLTHROUGH;
case 1:
xoffset += texImage->Border;
}
@@ -4203,11 +4204,11 @@ copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
case 3:
if (target != GL_TEXTURE_2D_ARRAY)
zoffset += texImage->Border;
/* fall-through */
FALLTHROUGH;
case 2:
if (target != GL_TEXTURE_1D_ARRAY)
yoffset += texImage->Border;
/* fall-through */
FALLTHROUGH;
case 1:
xoffset += texImage->Border;
}
@@ -5732,7 +5733,7 @@ compressed_tex_sub_image(unsigned dim, GLenum target, GLuint textureOrIndex,
break;
case TEX_MODE_CURRENT_NO_ERROR:
no_error = true;
/* fallthrough */
FALLTHROUGH;
case TEX_MODE_CURRENT_ERROR:
default:
assert(textureOrIndex == 0);

4
src/mesa/main/texobj.c
View File

@@ -74,6 +74,7 @@ valid_filter_for_float(const struct gl_context *ctx,
} else if (obj->_IsFloat && !ctx->Extensions.OES_texture_float_linear) {
return false;
}
FALLTHROUGH;
case GL_NEAREST:
case GL_NEAREST_MIPMAP_NEAREST:
break;
@@ -91,6 +92,7 @@ valid_filter_for_float(const struct gl_context *ctx,
} else if (obj->_IsFloat && !ctx->Extensions.OES_texture_float_linear) {
return false;
}
FALLTHROUGH;
case GL_NEAREST:
case GL_NEAREST_MIPMAP_NEAREST:
break;
@@ -387,7 +389,7 @@ finish_texture_init(struct gl_context *ctx, GLenum target,
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
filter = GL_NEAREST;
/* fallthrough */
FALLTHROUGH;
case GL_TEXTURE_RECTANGLE_NV:
case GL_TEXTURE_EXTERNAL_OES:

4
src/mesa/main/texparam.c
View File

@@ -286,7 +286,7 @@ set_tex_parameteri(struct gl_context *ctx,
texObj->Sampler.MinFilter = params[0];
return GL_TRUE;
}
/* fall-through */
FALLTHROUGH;
default:
goto invalid_param;
}
@@ -1704,7 +1704,7 @@ get_tex_level_parameter_image(struct gl_context *ctx,
case GL_TEXTURE_INTENSITY_TYPE_ARB:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_pname;
/* FALLTHROUGH */
FALLTHROUGH;
case GL_TEXTURE_RED_TYPE_ARB:
case GL_TEXTURE_GREEN_TYPE_ARB:
case GL_TEXTURE_BLUE_TYPE_ARB:

2
src/mesa/main/texstate.c
View File

@@ -248,7 +248,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
mode_a = GL_INTERPOLATE;
state->SourceA[0] = GL_CONSTANT;
state->OperandA[2] = GL_SRC_ALPHA;
/* FALLTHROUGH */
FALLTHROUGH;
case GL_LUMINANCE:
case GL_RED:
case GL_RG:

3
src/mesa/main/textureview.c
View File

@@ -503,7 +503,8 @@ _mesa_set_texture_view_state(struct gl_context *ctx,
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
texObj->NumLevels = 1;
texObj->ImmutableLevels = 1;
/* fallthrough - to set NumLayers */
FALLTHROUGH;
/* fallthrough to set NumLayers */
case GL_TEXTURE_2D_ARRAY:
case GL_TEXTURE_CUBE_MAP_ARRAY:

2
src/mesa/main/version.c
View File

@@ -599,7 +599,7 @@ _mesa_get_version(const struct gl_extensions *extensions,
if (!consts->AllowHigherCompatVersion) {
consts->GLSLVersion = consts->GLSLVersionCompat;
}
/* fall through */
FALLTHROUGH;
case API_OPENGL_CORE:
return compute_version(extensions, consts, api);
case API_OPENGLES:

2
src/mesa/program/prog_to_nir.c
View File

@@ -171,7 +171,7 @@ ptn_get_src(struct ptn_compile *c, const struct prog_src_register *prog_src)
src.src = nir_src_for_ssa(nir_imm_vec4(b, v[0], v[1], v[2], v[3]));
break;
}
/* FALLTHROUGH */
FALLTHROUGH;
case PROGRAM_STATE_VAR: {
assert(c->parameters != NULL);

2
src/mesa/state_tracker/st_atom_sampler.c
View File

@@ -318,7 +318,7 @@ update_shader_samplers(struct st_context *st,
if (stObj->pt->format == PIPE_FORMAT_R8_G8B8_420_UNORM)
/* no additional views needed */
break;
/* fallthrough */
FALLTHROUGH;
case PIPE_FORMAT_P010:
case PIPE_FORMAT_P012:
case PIPE_FORMAT_P016:

7
src/mesa/state_tracker/st_program.c
View File

@@ -1016,7 +1016,7 @@ st_translate_fragment_program(struct st_context *st,
interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
break;
}
/* fall through */
FALLTHROUGH;
case VARYING_SLOT_TEX0:
case VARYING_SLOT_TEX1:
case VARYING_SLOT_TEX2:
@@ -1032,7 +1032,7 @@ st_translate_fragment_program(struct st_context *st,
TGSI_INTERPOLATE_COUNT : TGSI_INTERPOLATE_PERSPECTIVE;
break;
}
/* fall through */
FALLTHROUGH;
case VARYING_SLOT_VAR0:
default:
/* Semantic indices should be zero-based because drivers may choose
@@ -1108,7 +1108,8 @@ st_translate_fragment_program(struct st_context *st,
assert(0);
break;
case FRAG_RESULT_COLOR:
write_all = GL_TRUE; /* fallthrough */
write_all = GL_TRUE;
FALLTHROUGH;
default: {
int index;
assert(loc == FRAG_RESULT_COLOR ||

2
src/mesa/state_tracker/st_program.h
View File

@@ -84,7 +84,7 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog)
key.lower_yuv |= (1 << unit);
break;
}
/* fallthrough */
FALLTHROUGH;
case PIPE_FORMAT_P010:
case PIPE_FORMAT_P012:
case PIPE_FORMAT_P016:

2
src/mesa/state_tracker/st_sampler_view.c
View File

@@ -500,7 +500,7 @@ get_sampler_view_format(struct st_context *st,
format = PIPE_FORMAT_R8_G8B8_420_UNORM;
break;
}
/* fallthrough */
FALLTHROUGH;
case PIPE_FORMAT_IYUV:
format = PIPE_FORMAT_R8_UNORM;
break;