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

gallium: 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:03:20 +01:00
parent 805b6b426e
commit 2d6fa03f74
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/auxiliary/util/u_inlines.h
View File

@@ -33,6 +33,7 @@
#include "pipe/p_shader_tokens.h" #include "pipe/p_shader_tokens.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#include "util/compiler.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "util/u_debug_describe.h" #include "util/u_debug_describe.h"
#include "util/u_debug_refcnt.h" #include "util/u_debug_refcnt.h"
@@ -708,7 +709,7 @@ util_max_layer(const struct pipe_resource *r, unsigned level)
return u_minify(r->depth0, level) - 1; return u_minify(r->depth0, level) - 1;
case PIPE_TEXTURE_CUBE: case PIPE_TEXTURE_CUBE:
assert(r->array_size == 6); assert(r->array_size == 6);
/* fall-through */ FALLTHROUGH;
case PIPE_TEXTURE_1D_ARRAY: case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_2D_ARRAY:
case PIPE_TEXTURE_CUBE_ARRAY: case PIPE_TEXTURE_CUBE_ARRAY:

3
src/gallium/auxiliary/util/u_prim.h
View File

@@ -31,6 +31,7 @@
#include "pipe/p_defines.h" #include "pipe/p_defines.h"
#include "util/compiler.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -277,7 +278,7 @@ u_reduced_prims_for_vertices(enum pipe_prim_type primitive, int vertices)
return u_decomposed_prims_for_vertices(primitive, vertices) * 2; return u_decomposed_prims_for_vertices(primitive, vertices) * 2;
case PIPE_PRIM_POLYGON: case PIPE_PRIM_POLYGON:
primitive = PIPE_PRIM_TRIANGLE_FAN; primitive = PIPE_PRIM_TRIANGLE_FAN;
/* fall through */ FALLTHROUGH;
default: default:
return u_decomposed_prims_for_vertices(primitive, vertices); return u_decomposed_prims_for_vertices(primitive, vertices);
} }

1
src/gallium/drivers/radeon/radeon_winsys.h
View File

@@ -817,6 +817,7 @@ static inline unsigned radeon_flags_from_heap(enum radeon_heap heap)
case RADEON_HEAP_GTT_UNCACHED_WC_READ_ONLY_32BIT: case RADEON_HEAP_GTT_UNCACHED_WC_READ_ONLY_32BIT:
case RADEON_HEAP_GTT_UNCACHED_WC_32BIT: case RADEON_HEAP_GTT_UNCACHED_WC_32BIT:
flags |= RADEON_FLAG_32BIT; flags |= RADEON_FLAG_32BIT;
FALLTHROUGH;
default: default:
break; break;
} }

4
src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
View File

@@ -34,7 +34,7 @@ static int amdgpu_surface_sanity(const struct pipe_resource *tex)
case PIPE_TEXTURE_1D: case PIPE_TEXTURE_1D:
if (tex->height0 > 1) if (tex->height0 > 1)
return -EINVAL; return -EINVAL;
/* fall through */ FALLTHROUGH;
case PIPE_TEXTURE_2D: case PIPE_TEXTURE_2D:
case PIPE_TEXTURE_RECT: case PIPE_TEXTURE_RECT:
if (tex->depth0 > 1 || tex->array_size > 1) if (tex->depth0 > 1 || tex->array_size > 1)
@@ -47,7 +47,7 @@ static int amdgpu_surface_sanity(const struct pipe_resource *tex)
case PIPE_TEXTURE_1D_ARRAY: case PIPE_TEXTURE_1D_ARRAY:
if (tex->height0 > 1) if (tex->height0 > 1)
return -EINVAL; return -EINVAL;
/* fall through */ FALLTHROUGH;
case PIPE_TEXTURE_CUBE: case PIPE_TEXTURE_CUBE:
case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_2D_ARRAY:
case PIPE_TEXTURE_CUBE_ARRAY: case PIPE_TEXTURE_CUBE_ARRAY: