Fix x64 visual studio build errors

.gitignore

@@ -14,11 +14,13 @@
 *.TMP
 *.VC.db
 *.VC.opendb
+*.vcproj
 *.vcxproj
 *.vcxproj.filters
 *.vcxproj.user
 *.vsp
 *~
+.*.sw*
 .gclient
 .gclient_entries
 /src/tests/third_party/gles_conformance_tests

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -947,7 +947,8 @@ gl::Error ProgramGL::syncState(const gl::Context *context, const gl::Program::Di
     for (size_t dirtyBit : dirtyBits)
     {
         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();
 }

src/tests/gl_tests/FramebufferMultiviewTest.cpp

@@ -55,7 +55,8 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
         }
         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 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
 
         // 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 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
         }
         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 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
 
         // 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 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
 
         // 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]);

src/tests/gl_tests/MultiviewDrawTest.cpp

@@ -128,7 +128,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase
                 break;
             case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
                 mReadFramebuffer.resize(numLayers);
-                glGenFramebuffers(mReadFramebuffer.size(), mReadFramebuffer.data());
+                glGenFramebuffers(static_cast<GLsizei>(mReadFramebuffer.size()),
+                                  mReadFramebuffer.data());
                 for (int i = 0; i < numLayers; ++i)
                 {
                     glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[i]);
@@ -197,7 +198,8 @@ class MultiviewFramebufferTestBase : public MultiviewTestBase
         }
         if (!mReadFramebuffer.empty())
         {
-            glDeleteFramebuffers(mReadFramebuffer.size(), mReadFramebuffer.data());
+            GLsizei framebufferCount = static_cast<GLsizei>(mReadFramebuffer.size());
+            glDeleteFramebuffers(framebufferCount, mReadFramebuffer.data());
             mReadFramebuffer.clear();
         }
         if (mDepthTexture)

src/tests/test_utils/MultiviewTest.cpp

@@ -150,9 +150,9 @@ void AttachMultiviewTextures(GLenum target,
             }
             for (size_t i = 0; i < colorTextures.size(); ++i)
             {
-                glFramebufferTextureMultiviewSideBySideANGLE(target, GL_COLOR_ATTACHMENT0 + i,
-                                                             colorTextures[i], 0, numViews,
-                                                             viewportOffsets.data());
+                GLenum attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
+                glFramebufferTextureMultiviewSideBySideANGLE(target, attachment, colorTextures[i],
+                                                             0, numViews, viewportOffsets.data());
             }
             if (depthTexture)
             {
@@ -170,8 +170,9 @@ void AttachMultiviewTextures(GLenum target,
         case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
             for (size_t i = 0; i < colorTextures.size(); ++i)
             {
-                glFramebufferTextureMultiviewLayeredANGLE(
-                    target, GL_COLOR_ATTACHMENT0 + i, colorTextures[i], 0, baseViewIndex, numViews);
+                GLenum attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
+                glFramebufferTextureMultiviewLayeredANGLE(target, attachment, colorTextures[i], 0,
+                                                          baseViewIndex, numViews);
             }
             if (depthTexture)
             {