commit b3584fb4906588611a8e8fb59ffabdaa96e37006
author Jamie Madill <jmadill@chromium.org> Thu Apr 09 17:34:21 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Thu Apr 09 17:35:08 2015 +0000
tree 116f8bb4fb096ac069e8b40752186bde4e4ab2c2
parent 0ca42a5f2e1e06cd7a30762d7e1d601b2c5165f3

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

Causing a build failure on Mac/Clang:

./Tokenizer.cpp:551:7: error: extra tokens at end of #else directive [-Werror,-Wextra-tokens]
#else if defined(_MSC_VER)

http://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Mac%20Builder/builds/29136

This reverts commit 3b26e231d99154814eb428f75a67bbe7a21adadc.

Change-Id: I2d11ddcc18130d908fd2ec3d6f5ab890cfccd5e7
Reviewed-on: https://chromium-review.googlesource.com/264983
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 19450ec..0dbc30a 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(static_cast<int>(mRenderer->getRendererCaps().minAliasedPointSize)) + ".0f;\n"
-                "static float maxPointSize = " + Str(static_cast<int>(mRenderer->getRendererCaps().maxAliasedPointSize)) + ".0f;\n"
+                "static float minPointSize = " + Str(mRenderer->getRendererCaps().minAliasedPointSize) + ".0f;\n"
+                "static float maxPointSize = " + Str(mRenderer->getRendererCaps().maxAliasedPointSize) + ".0f;\n"
                 "\n"
                 "[maxvertexcount(4)]\n"
                 "void main(point GS_INPUT input[1], inout TriangleStream<GS_OUTPUT> outStream)\n"