Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1244764d authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix implicit-fallthrough warnings." am: 81c202f1 am: 4b66bd3b 

am: 77d99fce

Change-Id: I24e43cf8504c756fb1841d72381cd70dcb2380e8
parents 0b2b5da1 77d99fce

opengl/libagl/state.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ static void enable_disable(ogles_context_t* c, GLenum cap, int enabled) 
    case GL_FOG:

    case GL_FOG:

    case GL_DEPTH_TEST:

    case GL_DEPTH_TEST:

        ogles_invalidate_perspective(c);

        ogles_invalidate_perspective(c);

        // fall-through...

        [[fallthrough]];

    case GL_BLEND:

    case GL_BLEND:

    case GL_SCISSOR_TEST:

    case GL_SCISSOR_TEST:

    case GL_ALPHA_TEST:

    case GL_ALPHA_TEST:

opengl/libagl/texture.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -401,14 +401,14 @@ static GLsizei dataSizePalette4(int numLevels, int width, int height, int format 
    switch (format) {

    switch (format) {

    case GL_PALETTE4_RGB8_OES:

    case GL_PALETTE4_RGB8_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_RGB8_OES:

    case GL_PALETTE8_RGB8_OES:

        entrySize = 3;

        entrySize = 3;

        break;

        break;





    case GL_PALETTE4_RGBA8_OES:

    case GL_PALETTE4_RGBA8_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_RGBA8_OES:

    case GL_PALETTE8_RGBA8_OES:

        entrySize = 4;

        entrySize = 4;

        break;

        break;
@@ -417,7 +417,7 @@ static GLsizei dataSizePalette4(int numLevels, int width, int height, int format 
    case GL_PALETTE4_RGBA4_OES:

    case GL_PALETTE4_RGBA4_OES:

    case GL_PALETTE4_RGB5_A1_OES:

    case GL_PALETTE4_RGB5_A1_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_R5_G6_B5_OES:

    case GL_PALETTE8_R5_G6_B5_OES:

    case GL_PALETTE8_RGBA4_OES:

    case GL_PALETTE8_RGBA4_OES:

    case GL_PALETTE8_RGB5_A1_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) {

    switch (format) {

    case GL_PALETTE4_RGB8_OES:

    case GL_PALETTE4_RGB8_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_RGB8_OES:

    case GL_PALETTE8_RGB8_OES:

        entrySize = 3;

        entrySize = 3;

        break;

        break;





    case GL_PALETTE4_RGBA8_OES:

    case GL_PALETTE4_RGBA8_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_RGBA8_OES:

    case GL_PALETTE8_RGBA8_OES:

        entrySize = 4;

        entrySize = 4;

        break;

        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_RGBA4_OES:

    case GL_PALETTE4_RGB5_A1_OES:

    case GL_PALETTE4_RGB5_A1_OES:

        indexBits = 4;

        indexBits = 4;

        /* FALLTHROUGH */

        [[fallthrough]];

    case GL_PALETTE8_R5_G6_B5_OES:

    case GL_PALETTE8_R5_G6_B5_OES:

    case GL_PALETTE8_RGBA4_OES:

    case GL_PALETTE8_RGBA4_OES:

    case GL_PALETTE8_RGB5_A1_OES:

    case GL_PALETTE8_RGB5_A1_OES: