Fix D3D11 errors where the application passes in QNAN to glPolygonOffset or for…

Fix D3D11 errors where the application passes in QNAN to glPolygonOffset or for the viewport bounds. TRAC #22565 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1924 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix D3D11 errors where the application passes in QNAN to glPolygonOffset or for…
31c4f235 · shannon.woods@transgaming.com · ce3128ad · 31c4f235 · 31c4f235
Commit 31c4f235 authored Feb 28, 2013 by shannon.woods@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Context.cpp src/libGLESv2/Context.cpp +3 -2

mathutil.h src/libGLESv2/mathutil.h +2 -1

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -480,8 +480,9 @@ bool Context::isPolygonOffsetFillEnabled() const
 void Context::setPolygonOffsetParams(GLfloat factor, GLfloat units)
 {
-    mState.rasterizer.polygonOffsetFactor = factor;
+    // An application can pass NaN values here, so handle this gracefully
-    mState.rasterizer.polygonOffsetUnits = units;
+    mState.rasterizer.polygonOffsetFactor = factor != factor ? 0.0f : factor;
+    mState.rasterizer.polygonOffsetUnits = units != units ? 0.0f : units;
 }
 void Context::setSampleAlphaToCoverage(bool enabled)

--- a/src/libGLESv2/mathutil.h
+++ b/src/libGLESv2/mathutil.h
@@ -56,7 +56,8 @@ inline unsigned int ceilPow2(unsigned int x)
 template<typename T, typename MIN, typename MAX>
 inline T clamp(T x, MIN min, MAX max)
 {
-    return x < min ? min : (x > max ? max : x);
+    // Since NaNs fail all comparison tests, a NaN value will default to min
+    return x > min ? (x > max ? max : x) : min;
 }
 inline float clamp01(float x)