commit 245e4e0965242d5cf3786bf275a09d64ff416628
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Mar 23 18:41:30 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Mar 23 18:41:30 2013 +0000
tree e4bbc2862469b67907a74c8d09e8b8d9d6bbf423
parent 898bc1353b10e1972563d7b6ede84b2057ba452a

Shader and Compiler track uses of gl_FragCoord and gl_FragData and MRT extension usage.

TRAC #22668

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

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

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 4b314ef..39c5983 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -48,6 +48,8 @@
     mUsesTexture2DProjLod0_bias = false;
     mUsesTextureCubeLod0 = false;
     mUsesTextureCubeLod0_bias = false;
+    mUsesFragColor = false;
+    mUsesFragData = false;
     mUsesDepthRange = false;
     mUsesFragCoord = false;
     mUsesPointCoord = false;
@@ -82,6 +84,8 @@
     mUsesAtan2_3 = false;
     mUsesAtan2_4 = false;
 
+    mNumRenderTargets = resources.EXT_draw_buffers ? resources.MaxDrawBuffers : 1;
+
     mScopeDepth = 0;
 
     mUniqueIndex = 0;
@@ -205,6 +209,11 @@
 
     if (shaderType == SH_FRAGMENT_SHADER)
     {
+        TExtensionBehavior::const_iterator iter = mContext.extensionBehavior().find("GL_EXT_draw_buffers");
+        bool usingMRTExtension = iter != mContext.extensionBehavior().end() && iter->second == EBhEnable;
+
+        unsigned int numColorValues = usingMRTExtension ? mNumRenderTargets : 1;
+
         out << "// Varyings\n";
         out <<  varyings;
         out << "\n"
@@ -582,6 +591,21 @@
             }
             else UNREACHABLE();
         }
+
+        if (usingMRTExtension && mNumRenderTargets > 1)
+        {
+            out << "#define GL_USES_MRT\n";
+        }
+
+        if (mUsesFragColor)
+        {
+            out << "#define GL_USES_FRAG_COLOR\n";
+        }
+
+        if (mUsesFragData)
+        {
+            out << "#define GL_USES_FRAG_DATA\n";
+        }
     }
     else   // Vertex shader
     {
@@ -1099,10 +1123,12 @@
     if (name == "gl_FragColor")
     {
         out << "gl_Color[0]";
+        mUsesFragColor = true;
     }
     else if (name == "gl_FragData")
     {
         out << "gl_Color";
+        mUsesFragData = true;
     }
     else if (name == "gl_DepthRange")
     {

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index 5be65d7..749a346 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -101,6 +101,8 @@
     bool mUsesTexture2DProjLod0_bias;
     bool mUsesTextureCubeLod0;
     bool mUsesTextureCubeLod0_bias;
+    bool mUsesFragColor;
+    bool mUsesFragData;
     bool mUsesDepthRange;
     bool mUsesFragCoord;
     bool mUsesPointCoord;
@@ -135,6 +137,8 @@
     bool mUsesAtan2_3;
     bool mUsesAtan2_4;
 
+    int mNumRenderTargets;
+
     typedef std::set<TString> Constructors;
     Constructors mConstructors;
 

src/libGLESv2/Shader.cpp

diff --git a/src/libGLESv2/Shader.cpp b/src/libGLESv2/Shader.cpp
index 00527d6..abddab4 100644
--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -297,6 +297,9 @@
             input = strstr(input, ";") + 2;
         }
 
+        mUsesMultipleRenderTargets = strstr(mHlsl, "GL_USES_MRT") != NULL;
+        mUsesFragColor = strstr(mHlsl, "GL_USES_FRAG_COLOR") != NULL;
+        mUsesFragData = strstr(mHlsl, "GL_USES_FRAG_DATA") != NULL;
         mUsesFragCoord = strstr(mHlsl, "GL_USES_FRAG_COORD") != NULL;
         mUsesFrontFacing = strstr(mHlsl, "GL_USES_FRONT_FACING") != NULL;
         mUsesPointSize = strstr(mHlsl, "GL_USES_POINT_SIZE") != NULL;
@@ -325,6 +328,9 @@
     // set by parseVaryings
     mVaryings.clear();
 
+    mUsesMultipleRenderTargets = false;
+    mUsesFragColor = false;
+    mUsesFragData = false;
     mUsesFragCoord = false;
     mUsesFrontFacing = false;
     mUsesPointSize = false;

src/libGLESv2/Shader.h

diff --git a/src/libGLESv2/Shader.h b/src/libGLESv2/Shader.h
index 2d87205..f471968 100644
--- a/src/libGLESv2/Shader.h
+++ b/src/libGLESv2/Shader.h
@@ -98,6 +98,9 @@
 
     VaryingList mVaryings;
 
+    bool mUsesMultipleRenderTargets;
+    bool mUsesFragColor;
+    bool mUsesFragData;
     bool mUsesFragCoord;
     bool mUsesFrontFacing;
     bool mUsesPointSize;