commit f4b9c7a7c9afaadb0ddb1a18ae7abd39f199ed7a
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Apr 12 23:29:32 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Apr 12 23:29:32 2013 +0000
tree 58476841d3efa3f537a1b7a33177df01bfd7f84e
parent d11ef0592c3ee151dd39ce8e507f8176e7178a77

Fix not correctly allowing the 'require' keyword in shaders enabling EXT_draw_buffers.

TRAC #22888

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Author: Jamie Madill

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

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index f6a9841..9bda365 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -210,9 +210,9 @@
     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;
+        const bool usingMRTExtension = (iter != mContext.extensionBehavior().end() && (iter->second == EBhEnable || iter->second == EBhRequire));
 
-        unsigned int numColorValues = usingMRTExtension ? mNumRenderTargets : 1;
+        const unsigned int numColorValues = usingMRTExtension ? mNumRenderTargets : 1;
 
         out << "// Varyings\n";
         out <<  varyings;