ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings." 

* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
  Fix clang -Wc++11-narrowing warnings.
This commit is contained in:
Chih-Hung Hsieh 2014-12-11 23:02:01 +00:00 committed by Android Git Automerger
parent d9799072de bceb29c83e
commit 2965dab909
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opengl/tests/EGLTest/egl_cache_test.cpp
View File

@ -41,7 +41,7 @@ protected:
};
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);
ASSERT_EQ(0, mCache->getBlob("abcd", 4, buf, 4));
ASSERT_EQ(0xee, buf[0]);
@ -51,7 +51,7 @@ TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) {
}
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->setBlob("abcd", 4, "efgh", 4);
ASSERT_EQ(4, mCache->getBlob("abcd", 4, buf, 4));
@ -62,7 +62,7 @@ TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) {
}
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->setBlob("abcd", 4, "efgh", 4);
mCache->terminate();
@ -94,7 +94,7 @@ protected:
};
TEST_F(EGLCacheSerializationTest, ReinitializedCacheContainsValues) {
char buf[4] = { 0xee, 0xee, 0xee, 0xee };
uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };
mCache->setCacheFilename(mFilename);
mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));
mCache->setBlob("abcd", 4, "efgh", 4);

2
opengl/tests/angeles/app-linux.cpp
View File

@ -118,7 +118,7 @@ static void checkEGLErrors()
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[] = {
EGL_DEPTH_SIZE, 16,

10
opengl/tests/fillrate/fillrate.cpp
View File

@ -91,11 +91,13 @@ int main(int argc, char** argv)
}
}
const GLfloat fh = h;
const GLfloat fw = w;
const GLfloat vertices[4][2] = {
{ 0, 0 },
{ 0, h },
{ w, h },
{ w, 0 }
{ 0, 0 },
{ 0, fh },
{ fw, fh },
{ fw, 0 }
};
const GLfloat texCoords[4][2] = {

9
opengl/tests/filter/filter.cpp
View File

@ -140,11 +140,12 @@ int main(int argc, char** argv)
//glDrawTexiOES(0, 0, 0, dim, dim);
const GLfloat fdim = dim;
const GLfloat vertices[4][2] = {
{ 0, 0 },
{ 0, dim },
{ dim, dim },
{ dim, 0 }
{ 0, 0 },
{ 0, fdim },
{ fdim, fdim },
{ fdim, 0 }
};
const GLfloat texCoords[4][2] = {

6
opengl/tests/linetex/linetex.cpp
View File

@ -80,9 +80,11 @@ int main(int argc, char** argv)
// default pack-alignment is 4
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] = {
{ w/2, 0 },
{ w/2, h }
{ fw2, 0 },
{ fw2, fh }
};
const GLfloat texCoords[4][2] = {