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

Commit bceb29c8 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix clang -Wc++11-narrowing warnings."

parents a59d7a6a 3bded917

opengl/tests/EGLTest/egl_cache_test.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ protected: 
};

};





TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) {

TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) {

    char buf[4] = { 0xee, 0xee, 0xee, 0xee };

    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->setBlob("abcd", 4, "efgh", 4);

    ASSERT_EQ(0, mCache->getBlob("abcd", 4, buf, 4));

    ASSERT_EQ(0, mCache->getBlob("abcd", 4, buf, 4));

    ASSERT_EQ(0xee, buf[0]);

    ASSERT_EQ(0xee, buf[0]);
@@ -51,7 +51,7 @@ TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) { 
}

}





TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) {

TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) {

    char buf[4] = { 0xee, 0xee, 0xee, 0xee };

    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->setBlob("abcd", 4, "efgh", 4);

    ASSERT_EQ(4, mCache->getBlob("abcd", 4, buf, 4));

    ASSERT_EQ(4, mCache->getBlob("abcd", 4, buf, 4));
@@ -62,7 +62,7 @@ TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) { 
}

}





TEST_F(EGLCacheTest, TerminatedCacheAlwaysMisses) {

TEST_F(EGLCacheTest, TerminatedCacheAlwaysMisses) {

    char buf[4] = { 0xee, 0xee, 0xee, 0xee };

    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->terminate();

    mCache->terminate();
@@ -94,7 +94,7 @@ protected: 
};

};





TEST_F(EGLCacheSerializationTest, ReinitializedCacheContainsValues) {

TEST_F(EGLCacheSerializationTest, ReinitializedCacheContainsValues) {

    char buf[4] = { 0xee, 0xee, 0xee, 0xee };

    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->setCacheFilename(mFilename);

    mCache->setCacheFilename(mFilename);

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->setBlob("abcd", 4, "efgh", 4);

opengl/tests/angeles/app-linux.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static void checkEGLErrors() 
        fprintf(stderr, "EGL Error: 0x%04x\n", (int)error);

        fprintf(stderr, "EGL Error: 0x%04x\n", (int)error);

}

}





static int initGraphics(unsigned samples, const WindowSurface& windowSurface)

static int initGraphics(EGLint samples, const WindowSurface& windowSurface)

{

{

    EGLint configAttribs[] = {

    EGLint configAttribs[] = {

            EGL_DEPTH_SIZE, 16,

            EGL_DEPTH_SIZE, 16,

opengl/tests/fillrate/fillrate.cpp

+6 −4
Original line number Original line Diff line number Diff line
@@ -91,11 +91,13 @@ int main(int argc, char** argv) 
         }

         }

     }

     }





     const GLfloat fh = h;

     const GLfloat fw = w;

     const GLfloat vertices[4][2] = {

     const GLfloat vertices[4][2] = {

             { 0,   0  },

             { 0,   0  },

             { 0,  h },

             { 0,   fh },

             { w,  h },

             { fw,  fh },

             { w,  0 }

             { fw,  0  }

     };

     };





     const GLfloat texCoords[4][2] = {

     const GLfloat texCoords[4][2] = {

opengl/tests/filter/filter.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -140,11 +140,12 @@ int main(int argc, char** argv) 




     //glDrawTexiOES(0, 0, 0, dim, dim);

     //glDrawTexiOES(0, 0, 0, dim, dim);

     

     

     const GLfloat fdim = dim;

     const GLfloat vertices[4][2] = {

     const GLfloat vertices[4][2] = {

             { 0,     0    },

             { 0,     0    },

             { 0,    dim },

             { 0,     fdim },

             { dim,  dim },

             { fdim,  fdim },

             { dim,  0   }

             { fdim,  0    }

     };

     };





     const GLfloat texCoords[4][2] = {

     const GLfloat texCoords[4][2] = {

opengl/tests/linetex/linetex.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -80,9 +80,11 @@ int main(int argc, char** argv) 
     // default pack-alignment is 4

     // default pack-alignment is 4

     const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 };

     const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 };





     const GLfloat fh = h;

     const GLfloat fw2 = w/2;

     const GLfloat vertices[4][2] = {

     const GLfloat vertices[4][2] = {

             { w/2,  0 },

             { fw2,  0  },

             { w/2,  h }

             { fw2,  fh }

     };

     };





     const GLfloat texCoords[4][2] = {

     const GLfloat texCoords[4][2] = {