Fix x64 visual studio build errors
Bug: angleproject:2740
Change-Id: I44fd2a1daf3dca764e2eef73e437feb32b36dbaa
Reviewed-on: https://chromium-review.googlesource.com/1185234
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/tests/gl_tests/FramebufferMultiviewTest.cpp b/src/tests/gl_tests/FramebufferMultiviewTest.cpp
index 04853a9..fadc469 100644
--- a/src/tests/gl_tests/FramebufferMultiviewTest.cpp
+++ b/src/tests/gl_tests/FramebufferMultiviewTest.cpp
@@ -55,7 +55,8 @@
}
if (!mColorTex.empty())
{
- glDeleteTextures(mColorTex.size(), mColorTex.data());
+ GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
+ glDeleteTextures(textureCount, mColorTex.data());
mColorTex.clear();
}
if (mDepthStencilTex != 0u)
@@ -78,7 +79,8 @@
// Generate textures.
mColorTex.resize(numColorBuffers);
- glGenTextures(mColorTex.size(), mColorTex.data());
+ GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
+ glGenTextures(textureCount, mColorTex.data());
if (stencil)
{
glGenTextures(1, &mDepthStencilTex);
@@ -182,12 +184,14 @@
}
if (!mNonMultiviewFBO.empty())
{
- glDeleteTextures(mNonMultiviewFBO.size(), mNonMultiviewFBO.data());
+ GLsizei textureCount = static_cast<GLsizei>(mNonMultiviewFBO.size());
+ glDeleteTextures(textureCount, mNonMultiviewFBO.data());
mNonMultiviewFBO.clear();
}
if (!mColorTex.empty())
{
- glDeleteTextures(mColorTex.size(), mColorTex.data());
+ GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
+ glDeleteTextures(textureCount, mColorTex.data());
mColorTex.clear();
}
if (mDepthStencilTex != 0u)
@@ -217,7 +221,8 @@
// Generate textures.
mColorTex.resize(numColorAttachments);
- glGenTextures(mColorTex.size(), mColorTex.data());
+ GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
+ glGenTextures(textureCount, mColorTex.data());
if (stencil)
{
glGenTextures(1, &mDepthStencilTex);
@@ -242,7 +247,8 @@
// Generate non-multiview FBOs and attach textures.
mNonMultiviewFBO.resize(numLayers);
- glGenFramebuffers(mNonMultiviewFBO.size(), mNonMultiviewFBO.data());
+ GLsizei framebufferCount = static_cast<GLsizei>(mNonMultiviewFBO.size());
+ glGenFramebuffers(framebufferCount, mNonMultiviewFBO.data());
for (int i = 0; i < numLayers; ++i)
{
glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[i]);