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

Commit 06ab7953 authored by Kalle Raita's avatar Kalle Raita Committed by Android (Google) Code Review
Browse files

Merge "Fix signed vs. unsigned mismatch warnings"

parents 1208546a 4cf36370

opengl/tests/EGLTest/EGL_test.cpp

+12 −10
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ 




namespace android {

namespace android {





#define EGL_UNSIGNED_TRUE static_cast<EGLBoolean>(EGL_TRUE)



class EGLTest : public ::testing::Test {

class EGLTest : public ::testing::Test {

protected:

protected:

    EGLDisplay mEglDisplay;

    EGLDisplay mEglDisplay;
@@ -48,7 +50,7 @@ protected: 




    virtual void TearDown() {

    virtual void TearDown() {

        EGLBoolean success = eglTerminate(mEglDisplay);

        EGLBoolean success = eglTerminate(mEglDisplay);

        ASSERT_EQ(EGL_TRUE, success);

        ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

        ASSERT_EQ(EGL_SUCCESS, eglGetError());

        ASSERT_EQ(EGL_SUCCESS, eglGetError());

    }

    }

};

};
@@ -65,20 +67,20 @@ TEST_F(EGLTest, DISABLED_EGLConfigEightBitFirst) { 
    };

    };





    success = eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs);

    success = eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_GE(numConfigs, 1);

    ASSERT_GE(numConfigs, 1);





    EGLint components[3];

    EGLint components[3];





    success = eglGetConfigAttrib(mEglDisplay, config, EGL_RED_SIZE, &components[0]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_RED_SIZE, &components[0]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_GREEN_SIZE, &components[1]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_GREEN_SIZE, &components[1]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_BLUE_SIZE, &components[2]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_BLUE_SIZE, &components[2]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());





    EXPECT_GE(components[0], 8);

    EXPECT_GE(components[0], 8);
@@ -139,23 +141,23 @@ TEST_F(EGLTest, EGLConfigRGBA8888First) { 
    };

    };





    success = eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs);

    success = eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_GE(numConfigs, 1);

    ASSERT_GE(numConfigs, 1);





    EGLint components[4];

    EGLint components[4];





    success = eglGetConfigAttrib(mEglDisplay, config, EGL_RED_SIZE, &components[0]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_RED_SIZE, &components[0]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_GREEN_SIZE, &components[1]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_GREEN_SIZE, &components[1]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_BLUE_SIZE, &components[2]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_BLUE_SIZE, &components[2]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_ALPHA_SIZE, &components[3]);

    success = eglGetConfigAttrib(mEglDisplay, config, EGL_ALPHA_SIZE, &components[3]);

    ASSERT_EQ(EGL_TRUE, success);

    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());

    ASSERT_EQ(EGL_SUCCESS, eglGetError());





    EXPECT_GE(components[0], 8);

    EXPECT_GE(components[0], 8);