commit 3b26e231d99154814eb428f75a67bbe7a21adadc
author Minmin Gong <mgong@microsoft.com> Tue Apr 07 18:31:54 2015 -0700
committer Jamie Madill <jmadill@chromium.org> Thu Apr 09 14:05:37 2015 +0000
tree dcf4e9a9a6c0e16bb992bf895b9636f4fad84fe5
parent 47fadcb975e91ff33527cc5f460eb08a97d2a0ff

Fix and enable warning C4244 (Conversion from 'type1' to 'type2', possible loss of data)

Change-Id: I73d9a2b9ad16f032be974b9c819de0dc1247c2ea
Reviewed-on: https://chromium-review.googlesource.com/264533
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/DynamicHLSL.cpp

diff --git a/src/libANGLE/renderer/d3d/DynamicHLSL.cpp b/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
index 0dbc30a..19450ec 100644
--- a/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+++ b/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
@@ -1161,8 +1161,8 @@
                 "    float2(0.0f, 0.0f)\n"
                 "};\n"
                 "\n"
-                "static float minPointSize = " + Str(mRenderer->getRendererCaps().minAliasedPointSize) + ".0f;\n"
-                "static float maxPointSize = " + Str(mRenderer->getRendererCaps().maxAliasedPointSize) + ".0f;\n"
+                "static float minPointSize = " + Str(static_cast<int>(mRenderer->getRendererCaps().minAliasedPointSize)) + ".0f;\n"
+                "static float maxPointSize = " + Str(static_cast<int>(mRenderer->getRendererCaps().maxAliasedPointSize)) + ".0f;\n"
                 "\n"
                 "[maxvertexcount(4)]\n"
                 "void main(point GS_INPUT input[1], inout TriangleStream<GS_OUTPUT> outStream)\n"