Commit 47c058c3 by alokp@chromium.org

Fixing compile error. GYP projects use NOMINMAX to suppress non-standard VC++ min/max.

Review URL: http://codereview.appspot.com/892046 git-svn-id: https://angleproject.googlecode.com/svn/trunk@137 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 277b7142
...@@ -1624,7 +1624,7 @@ bool OutputHLSL::handleExcessiveLoop(TIntermLoop *node) ...@@ -1624,7 +1624,7 @@ bool OutputHLSL::handleExcessiveLoop(TIntermLoop *node)
while (iterations > 0) while (iterations > 0)
{ {
int remainder = (limit - initial + 1) % increment; int remainder = (limit - initial + 1) % increment;
int clampedLimit = initial + increment * min(255, iterations) - 1 - remainder; int clampedLimit = initial + increment * std::min(255, iterations) - 1 - remainder;
// for(int index = initial; index < clampedLimit; index += increment) // for(int index = initial; index < clampedLimit; index += increment)
......
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