From 39ecdeaaa1890f9116c38c84dbb3da7867abe4c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Thu, 21 May 2015 19:45:46 -0700 Subject: [PATCH] Fix -Wconversion warnings in vertex texture tests. Bug: 21161908 Change-Id: I2539c2cbcf9bedd1b1c38bacd7855a29eae818b4 --- modules/gles2/functional/es2fVertexTextureTests.cpp | 12 ++++++------ modules/gles3/functional/es3fVertexTextureTests.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/gles2/functional/es2fVertexTextureTests.cpp b/modules/gles2/functional/es2fVertexTextureTests.cpp index 8d46665..432b2a4 100644 --- a/modules/gles2/functional/es2fVertexTextureTests.cpp +++ b/modules/gles2/functional/es2fVertexTextureTests.cpp @@ -248,13 +248,13 @@ PosTexCoordQuadGrid::PosTexCoordQuadGrid (int gridSize, const IVec2& re for (int i = 0; i < DE_LENGTH_OF_ARRAY(quadVertices); i++) m_positions.push_back(safeCoords(quadVertices[i], renderSize, Vec2(0.0f)) * 2.0f - 1.0f); - m_indices.push_back(firstNdx + 0); - m_indices.push_back(firstNdx + 1); - m_indices.push_back(firstNdx + 2); + m_indices.push_back(deUint16(firstNdx + 0)); + m_indices.push_back(deUint16(firstNdx + 1)); + m_indices.push_back(deUint16(firstNdx + 2)); - m_indices.push_back(firstNdx + 1); - m_indices.push_back(firstNdx + 3); - m_indices.push_back(firstNdx + 2); + m_indices.push_back(deUint16(firstNdx + 1)); + m_indices.push_back(deUint16(firstNdx + 3)); + m_indices.push_back(deUint16(firstNdx + 2)); } m_texCoords.reserve(m_gridSize*m_gridSize*4); diff --git a/modules/gles3/functional/es3fVertexTextureTests.cpp b/modules/gles3/functional/es3fVertexTextureTests.cpp index 8fc1eef..a2cd1c0 100644 --- a/modules/gles3/functional/es3fVertexTextureTests.cpp +++ b/modules/gles3/functional/es3fVertexTextureTests.cpp @@ -298,13 +298,13 @@ PosTexCoordQuadGrid::PosTexCoordQuadGrid (int gridSize, const IVec2& re for (int i = 0; i < DE_LENGTH_OF_ARRAY(quadVertices); i++) m_positions.push_back(safeCoords(quadVertices[i], renderSize, Vec2(0.0f)) * 2.0f - 1.0f); - m_indices.push_back(firstNdx + 0); - m_indices.push_back(firstNdx + 1); - m_indices.push_back(firstNdx + 2); + m_indices.push_back(deUint16(firstNdx + 0)); + m_indices.push_back(deUint16(firstNdx + 1)); + m_indices.push_back(deUint16(firstNdx + 2)); - m_indices.push_back(firstNdx + 1); - m_indices.push_back(firstNdx + 3); - m_indices.push_back(firstNdx + 2); + m_indices.push_back(deUint16(firstNdx + 1)); + m_indices.push_back(deUint16(firstNdx + 3)); + m_indices.push_back(deUint16(firstNdx + 2)); } m_texCoords.reserve(m_gridSize*m_gridSize*4); -- 2.7.4