From b235b9f0b983849af982ad2f0475ce773311102b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Thu, 21 May 2015 21:30:36 -0700 Subject: [PATCH] Fix -Wconversion warnings in negative api tests. Bug: 21161908 Change-Id: I998c0a57242f18d8a5b66eb3f30aba481895d4c2 --- modules/gles3/functional/es3fNegativeTextureApiTests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gles3/functional/es3fNegativeTextureApiTests.cpp b/modules/gles3/functional/es3fNegativeTextureApiTests.cpp index e88288d..a8453d8 100644 --- a/modules/gles3/functional/es3fNegativeTextureApiTests.cpp +++ b/modules/gles3/functional/es3fNegativeTextureApiTests.cpp @@ -524,7 +524,7 @@ void NegativeTextureApiTests::init (void) FOR_CUBE_FACES(faceGL, { - glCompressedTexImage2D(faceGL, 0, format, blockPixels.x(), blockPixels.y(), 0, blockBytes, &dummyData[0]); + glCompressedTexImage2D(faceGL, 0, format, blockPixels.x(), blockPixels.y(), 0, (int)blockBytes, &dummyData[0]); expectError(requiredError); }); } @@ -2696,10 +2696,10 @@ void NegativeTextureApiTests::init (void) const size_t blockBytes = getBlockSize(tcuFormat); const vector dummyData (blockBytes); - glCompressedTexImage3D(GL_TEXTURE_3D, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, blockBytes, &dummyData[0]); + glCompressedTexImage3D(GL_TEXTURE_3D, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, (int)blockBytes, &dummyData[0]); expectError(requiredError); - glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, blockBytes, &dummyData[0]); + glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, (int)blockBytes, &dummyData[0]); expectError(requiredError); } } -- 2.7.4