Commit c4097441 by Shahbaz Youssefi Committed by Commit Bot

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: 's avatarJamie Madill <jmadill@chromium.org>
parent 9259fd0d
...@@ -14,11 +14,13 @@ ...@@ -14,11 +14,13 @@
*.TMP *.TMP
*.VC.db *.VC.db
*.VC.opendb *.VC.opendb
*.vcproj
*.vcxproj *.vcxproj
*.vcxproj.filters *.vcxproj.filters
*.vcxproj.user *.vcxproj.user
*.vsp *.vsp
*~ *~
.*.sw*
.gclient .gclient
.gclient_entries .gclient_entries
/src/tests/third_party/gles_conformance_tests /src/tests/third_party/gles_conformance_tests
......
...@@ -947,7 +947,8 @@ gl::Error ProgramGL::syncState(const gl::Context *context, const gl::Program::Di ...@@ -947,7 +947,8 @@ gl::Error ProgramGL::syncState(const gl::Context *context, const gl::Program::Di
for (size_t dirtyBit : dirtyBits) for (size_t dirtyBit : dirtyBits)
{ {
ASSERT(dirtyBit <= gl::Program::DIRTY_BIT_UNIFORM_BLOCK_BINDING_MAX); ASSERT(dirtyBit <= gl::Program::DIRTY_BIT_UNIFORM_BLOCK_BINDING_MAX);
setUniformBlockBinding(dirtyBit, mState.getUniformBlockBinding(dirtyBit)); GLuint binding = static_cast<GLuint>(dirtyBit);
setUniformBlockBinding(binding, mState.getUniformBlockBinding(binding));
} }
return gl::NoError(); return gl::NoError();
} }
......
...@@ -55,7 +55,8 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -55,7 +55,8 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
} }
if (!mColorTex.empty()) if (!mColorTex.empty())
{ {
glDeleteTextures(mColorTex.size(), mColorTex.data()); GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
glDeleteTextures(textureCount, mColorTex.data());
mColorTex.clear(); mColorTex.clear();
} }
if (mDepthStencilTex != 0u) if (mDepthStencilTex != 0u)
...@@ -78,7 +79,8 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -78,7 +79,8 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
// Generate textures. // Generate textures.
mColorTex.resize(numColorBuffers); mColorTex.resize(numColorBuffers);
glGenTextures(mColorTex.size(), mColorTex.data()); GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
glGenTextures(textureCount, mColorTex.data());
if (stencil) if (stencil)
{ {
glGenTextures(1, &mDepthStencilTex); glGenTextures(1, &mDepthStencilTex);
...@@ -182,12 +184,14 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -182,12 +184,14 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
} }
if (!mNonMultiviewFBO.empty()) if (!mNonMultiviewFBO.empty())
{ {
glDeleteTextures(mNonMultiviewFBO.size(), mNonMultiviewFBO.data()); GLsizei textureCount = static_cast<GLsizei>(mNonMultiviewFBO.size());
glDeleteTextures(textureCount, mNonMultiviewFBO.data());
mNonMultiviewFBO.clear(); mNonMultiviewFBO.clear();
} }
if (!mColorTex.empty()) if (!mColorTex.empty())
{ {
glDeleteTextures(mColorTex.size(), mColorTex.data()); GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
glDeleteTextures(textureCount, mColorTex.data());
mColorTex.clear(); mColorTex.clear();
} }
if (mDepthStencilTex != 0u) if (mDepthStencilTex != 0u)
...@@ -217,7 +221,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -217,7 +221,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
// Generate textures. // Generate textures.
mColorTex.resize(numColorAttachments); mColorTex.resize(numColorAttachments);
glGenTextures(mColorTex.size(), mColorTex.data()); GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
glGenTextures(textureCount, mColorTex.data());
if (stencil) if (stencil)
{ {
glGenTextures(1, &mDepthStencilTex); glGenTextures(1, &mDepthStencilTex);
...@@ -242,7 +247,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -242,7 +247,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
// Generate non-multiview FBOs and attach textures. // Generate non-multiview FBOs and attach textures.
mNonMultiviewFBO.resize(numLayers); 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) for (int i = 0; i < numLayers; ++i)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[i]); glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[i]);
......
...@@ -128,7 +128,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase ...@@ -128,7 +128,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase
break; break;
case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE: case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
mReadFramebuffer.resize(numLayers); mReadFramebuffer.resize(numLayers);
glGenFramebuffers(mReadFramebuffer.size(), mReadFramebuffer.data()); glGenFramebuffers(static_cast<GLsizei>(mReadFramebuffer.size()),
mReadFramebuffer.data());
for (int i = 0; i < numLayers; ++i) for (int i = 0; i < numLayers; ++i)
{ {
glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[i]); glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[i]);
...@@ -197,7 +198,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase ...@@ -197,7 +198,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase
} }
if (!mReadFramebuffer.empty()) if (!mReadFramebuffer.empty())
{ {
glDeleteFramebuffers(mReadFramebuffer.size(), mReadFramebuffer.data()); GLsizei framebufferCount = static_cast<GLsizei>(mReadFramebuffer.size());
glDeleteFramebuffers(framebufferCount, mReadFramebuffer.data());
mReadFramebuffer.clear(); mReadFramebuffer.clear();
} }
if (mDepthTexture) if (mDepthTexture)
......
...@@ -150,9 +150,9 @@ void AttachMultiviewTextures(GLenum target, ...@@ -150,9 +150,9 @@ void AttachMultiviewTextures(GLenum target,
} }
for (size_t i = 0; i < colorTextures.size(); ++i) for (size_t i = 0; i < colorTextures.size(); ++i)
{ {
glFramebufferTextureMultiviewSideBySideANGLE(target, GL_COLOR_ATTACHMENT0 + i, GLenum attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
colorTextures[i], 0, numViews, glFramebufferTextureMultiviewSideBySideANGLE(target, attachment, colorTextures[i],
viewportOffsets.data()); 0, numViews, viewportOffsets.data());
} }
if (depthTexture) if (depthTexture)
{ {
...@@ -170,8 +170,9 @@ void AttachMultiviewTextures(GLenum target, ...@@ -170,8 +170,9 @@ void AttachMultiviewTextures(GLenum target,
case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE: case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
for (size_t i = 0; i < colorTextures.size(); ++i) for (size_t i = 0; i < colorTextures.size(); ++i)
{ {
glFramebufferTextureMultiviewLayeredANGLE( GLenum attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
target, GL_COLOR_ATTACHMENT0 + i, colorTextures[i], 0, baseViewIndex, numViews); glFramebufferTextureMultiviewLayeredANGLE(target, attachment, colorTextures[i], 0,
baseViewIndex, numViews);
} }
if (depthTexture) if (depthTexture)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment