Eliminate unused DX11 driver uniforms.
TRAC #22428
Signed-off-by: Geoff Lang
Signed-off-by: Jamie Madill
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1895 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index b12af1f..f0dbd09 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -96,7 +96,7 @@
{
if (mContext.shaderType == SH_FRAGMENT_SHADER)
{
- mUniformRegister = 3; // Reserve registers for dx_DepthRange, dx_Coord and dx_DepthFront
+ mUniformRegister = 3; // Reserve registers for dx_DepthRange, dx_ViewCoords and dx_DepthFront
}
else
{
@@ -250,7 +250,7 @@
if (mUsesFragCoord)
{
- out << " float4 dx_Coord : packoffset(c1);\n";
+ out << " float4 dx_ViewCoords : packoffset(c1);\n";
}
if (mUsesFragCoord || mUsesFrontFacing)
@@ -269,7 +269,7 @@
if (mUsesFragCoord)
{
- out << "uniform float4 dx_Coord : register(c1);\n";
+ out << "uniform float4 dx_ViewCoords : register(c1);\n";
}
if (mUsesFragCoord || mUsesFrontFacing)
@@ -613,16 +613,14 @@
if (mOutputType == SH_HLSL11_OUTPUT)
{
- out << "cbuffer DriverConstants : register(b1)\n"
- "{\n";
-
if (mUsesDepthRange)
{
- out << " float3 dx_DepthRange : packoffset(c0);\n";
+ out << "cbuffer DriverConstants : register(b1)\n"
+ "{\n"
+ " float3 dx_DepthRange : packoffset(c0);\n"
+ "};\n"
+ "\n";
}
-
- out << " float2 dx_HalfPixelSize : packoffset(c1);\n";
- out << "};\n";
}
else
{
@@ -631,11 +629,10 @@
out << "uniform float3 dx_DepthRange : register(c0);\n";
}
- out << "uniform float2 dx_HalfPixelSize : register(c1);\n";
+ out << "uniform float2 dx_HalfPixelSize : register(c1);\n"
+ "\n";
}
- out << "\n";
-
if (mUsesDepthRange)
{
out << "static gl_DepthRangeParameters gl_DepthRange = {dx_DepthRange.x, dx_DepthRange.y, dx_DepthRange.z};\n"