commit 1298518804934fac7f8ecd37ad58a5ac100cff36
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:56:31 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:56:31 2012 +0000
tree a5ab05234ced7e6c5ace8d76028ae7ee5ab0dd7c
parent 97c852b2e2fc61b2712be3c00cd4ba4b14dadeb6

Combine dx_Depth and dx_FrontCCW into dx_DepthFront.

TRAC #22245
Signed-off-by: Daniel Koch
Signed-off-by: Geoff Lang
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1582 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 1c0c82a..f006a00 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -207,13 +207,12 @@
 
         if (mUsesFragCoord)
         {
-            out << "uniform float4 dx_Coord;\n"
-                   "uniform float2 dx_Depth;\n";
+            out << "uniform float4 dx_Coord;\n";
         }
 
-        if (mUsesFrontFacing)
+        if (mUsesFragCoord || mUsesFrontFacing)
         {
-            out << "uniform float dx_FrontCCW;\n";
+            out << "uniform float3 dx_DepthFront;\n";
         }
         
         out << "\n";