Fix warnings from size_t conversions.

These casts could result in overflow. Bug: chromium:842028 Change-Id: I998b638c58333a29f6bc9136ae3e81b90683cb72 Reviewed-on: https://chromium-review.googlesource.com/1057415Reviewed-by: Luc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fix warnings from size_t conversions.
b878f00d · Jamie Madill · Commit Bot · 461b09a8 · b878f00d · b878f00d
Commit b878f00d authored May 14, 2018 by Jamie Madill Committed by Commit Bot May 14, 2018
Showing with 4 additions and 3 deletions

VertexBuffer.cpp src/libANGLE/renderer/d3d/VertexBuffer.cpp +1 -1

VertexBuffer.h src/libANGLE/renderer/d3d/VertexBuffer.h +1 -1

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +2 -1

No files found.
--- a/src/libANGLE/renderer/d3d/VertexBuffer.cpp
+++ b/src/libANGLE/renderer/d3d/VertexBuffer.cpp
@@ -92,7 +92,7 @@ gl::Error VertexBufferInterface::setBufferSize(unsigned int size)
 gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired(
    const gl::VertexAttribute &attrib,
    const gl::VertexBinding &binding,
-    GLsizei count,
+    size_t count,
    GLsizei instances) const
 {
    unsigned int spaceRequired = 0;

--- a/src/libANGLE/renderer/d3d/VertexBuffer.h
+++ b/src/libANGLE/renderer/d3d/VertexBuffer.h
@@ -93,7 +93,7 @@ class VertexBufferInterface : angle::NonCopyable
    gl::ErrorOrResult<unsigned int> getSpaceRequired(const gl::VertexAttribute &attrib,
                                                     const gl::VertexBinding &binding,
-                                                     GLsizei count,
+                                                     size_t count,
                                                     GLsizei instances) const;
    BufferFactoryD3D *const mFactory;
    VertexBuffer *mVertexBuffer;

--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -3583,7 +3583,8 @@ gl::ErrorOrResult<unsigned int> Renderer11::getVertexSpaceRequired(
    const unsigned int divisor = binding.getDivisor();
    if (instances == 0 || divisor == 0)
    {
-        elementCount = count;
+        // This could be a clipped cast.
+        elementCount = gl::clampCast<unsigned int>(count);
    }
    else
    {