diff options
| author | 2018-10-19 14:23:46 -0700 | |
|---|---|---|
| committer | 2018-10-19 14:23:46 -0700 | |
| commit | 1264e686f72cfa6b8078d141dccd09862605e255 (patch) | |
| tree | 8f0b8083bc8117f0c34bb3dba4a413e42053f5bc | |
| parent | d88ac7f787eb4541a0afb8903f87267d039c98e1 (diff) | |
Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: I037abe443a47a12136744b8eb3720f75ecd9b578
| -rw-r--r-- | opengl/libagl/state.cpp | 2 | ||||
| -rw-r--r-- | opengl/libagl/texture.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/opengl/libagl/state.cpp b/opengl/libagl/state.cpp index 1d5def5896..8bb7e83820 100644 --- a/opengl/libagl/state.cpp +++ b/opengl/libagl/state.cpp @@ -181,7 +181,7 @@ static void enable_disable(ogles_context_t* c, GLenum cap, int enabled) case GL_FOG: case GL_DEPTH_TEST: ogles_invalidate_perspective(c); - // fall-through... + [[fallthrough]]; case GL_BLEND: case GL_SCISSOR_TEST: case GL_ALPHA_TEST: diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index aae8e058bf..4c5f3e93d3 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -401,14 +401,14 @@ static GLsizei dataSizePalette4(int numLevels, int width, int height, int format switch (format) { case GL_PALETTE4_RGB8_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_RGB8_OES: entrySize = 3; break; case GL_PALETTE4_RGBA8_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_RGBA8_OES: entrySize = 4; break; @@ -417,7 +417,7 @@ static GLsizei dataSizePalette4(int numLevels, int width, int height, int format case GL_PALETTE4_RGBA4_OES: case GL_PALETTE4_RGB5_A1_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_RGBA4_OES: case GL_PALETTE8_RGB5_A1_OES: @@ -446,14 +446,14 @@ static void decodePalette4(const GLvoid *data, int level, int width, int height, switch (format) { case GL_PALETTE4_RGB8_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_RGB8_OES: entrySize = 3; break; case GL_PALETTE4_RGBA8_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_RGBA8_OES: entrySize = 4; break; @@ -462,7 +462,7 @@ static void decodePalette4(const GLvoid *data, int level, int width, int height, case GL_PALETTE4_RGBA4_OES: case GL_PALETTE4_RGB5_A1_OES: indexBits = 4; - /* FALLTHROUGH */ + [[fallthrough]]; case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_RGBA4_OES: case GL_PALETTE8_RGB5_A1_OES: |