Mesa (master): drirc: Add quirk to disable GLSL line continuations for Savage2

Carl Worth cworth at kemper.freedesktop.org
Fri Jan 11 22:31:40 UTC 2013


Module: Mesa
Branch: master
Commit: 4b00ecebd0019202315f0f4a9e6105d962e659f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b00ecebd0019202315f0f4a9e6105d962e659f7

Author: Carl Worth <cworth at cworth.org>
Date:   Wed Dec  5 16:36:06 2012 -0800

drirc: Add quirk to disable GLSL line continuations for Savage2

This application is known to contain shaders that:

1. Have a stray backslash as the last line of comment lines
2. Have a declaration immediately following that line

Hence, interpreting that backslash as a line continuation causes the
declaration to be hidden and the shader fails to compile.  Fortunately, the
shaders also:

3. Do not have any other intentional line-continuation characters

So disabling line continuations entirely for the application fixes this
problem without causing any other breakage.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/common/drirc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/common/drirc b/src/mesa/drivers/dri/common/drirc
index cf13cdb..a13941f 100644
--- a/src/mesa/drivers/dri/common/drirc
+++ b/src/mesa/drivers/dri/common/drirc
@@ -22,5 +22,8 @@
         <application name="Unigine OilRush (64-bit)" executable="OilRush_x64">
             <option name="disable_blend_func_extended" value="true" />
 	</application>
+        <application name="Savage 2" executable="savage2.bin">
+            <option name="disable_glsl_line_continuations" value="true" />
+        </application>
     </device>
 </driconf>




More information about the mesa-commit mailing list