diff options
author | Zhenyao Mo <zmo@chromium.org> | 2014-03-07 13:00:08 -0800 |
---|---|---|
committer | Zhenyao Mo <zmo@chromium.org> | 2014-03-11 18:25:18 +0000 |
commit | 3cdfcce86b38ef31a0afd71855887193a7924468 (patch) | |
tree | 855a1098b84960dd05065aece2587dfa2e980ec2 /include | |
parent | 276abc85533a3e41fe2b159786c6b92df10a3a15 (diff) | |
download | angle-3cdfcce86b38ef31a0afd71855887193a7924468.tar.gz |
Remove SH_MAP_LONG_VARIABLE_NAMES
We use hashing to map all variables/strcuture field names, etc,
so we no longer need this option.
Checked with Firefox and WebKit, they no longer use this option
either. Time to remove it.
Change-Id: Ie3e79b91a05258b04af419a9c42b2fd1b00e67c4
Reviewed-on: https://chromium-review.googlesource.com/189236
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/189568
Diffstat (limited to 'include')
-rw-r--r-- | include/GLSLANG/ShaderLang.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h index 255a52a1..31476869 100644 --- a/include/GLSLANG/ShaderLang.h +++ b/include/GLSLANG/ShaderLang.h @@ -168,16 +168,15 @@ typedef enum { SH_VARIABLES = 0x0008, SH_LINE_DIRECTIVES = 0x0010, SH_SOURCE_PATH = 0x0020, - SH_MAP_LONG_VARIABLE_NAMES = 0x0040, - SH_UNROLL_FOR_LOOP_WITH_INTEGER_INDEX = 0x0080, + SH_UNROLL_FOR_LOOP_WITH_INTEGER_INDEX = 0x0040, // If a sampler array index happens to be a loop index, // 1) if its type is integer, unroll the loop. // 2) if its type is float, fail the shader compile. // This is to work around a mac driver bug. - SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX = 0x0100, + SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX = 0x0080, // This is needed only as a workaround for certain OpenGL driver bugs. - SH_EMULATE_BUILT_IN_FUNCTIONS = 0x0200, + SH_EMULATE_BUILT_IN_FUNCTIONS = 0x0100, // This is an experimental flag to enforce restrictions that aim to prevent // timing attacks. @@ -185,7 +184,7 @@ typedef enum { // texture information via the timing channel. // To use this flag, you must compile the shader under the WebGL spec // (using the SH_WEBGL_SPEC flag). - SH_TIMING_RESTRICTIONS = 0x0400, + SH_TIMING_RESTRICTIONS = 0x0200, // This flag prints the dependency graph that is used to enforce timing // restrictions on fragment shaders. @@ -193,7 +192,7 @@ typedef enum { // - The shader spec is SH_WEBGL_SPEC. // - The compile options contain the SH_TIMING_RESTRICTIONS flag. // - The shader type is SH_FRAGMENT_SHADER. - SH_DEPENDENCY_GRAPH = 0x0800, + SH_DEPENDENCY_GRAPH = 0x0400, // Enforce the GLSL 1.017 Appendix A section 7 packing restrictions. // This flag only enforces (and can only enforce) the packing @@ -201,7 +200,7 @@ typedef enum { // shaders. ShCheckVariablesWithinPackingLimits() lets embedders // enforce the packing restrictions for varying variables during // program link time. - SH_ENFORCE_PACKING_RESTRICTIONS = 0x1000, + SH_ENFORCE_PACKING_RESTRICTIONS = 0x0800, // This flag ensures all indirect (expression-based) array indexing // is clamped to the bounds of the array. This ensures, for example, @@ -209,32 +208,32 @@ typedef enum { // vec234, or mat234 type. The ShArrayIndexClampingStrategy enum, // specified in the ShBuiltInResources when constructing the // compiler, selects the strategy for the clamping implementation. - SH_CLAMP_INDIRECT_ARRAY_BOUNDS = 0x2000, + SH_CLAMP_INDIRECT_ARRAY_BOUNDS = 0x1000, // This flag limits the complexity of an expression. - SH_LIMIT_EXPRESSION_COMPLEXITY = 0x4000, + SH_LIMIT_EXPRESSION_COMPLEXITY = 0x2000, // This flag limits the depth of the call stack. - SH_LIMIT_CALL_STACK_DEPTH = 0x8000, + SH_LIMIT_CALL_STACK_DEPTH = 0x4000, // This flag initializes gl_Position to vec4(0,0,0,0) at the // beginning of the vertex shader's main(), and has no effect in the // fragment shader. It is intended as a workaround for drivers which // incorrectly fail to link programs if gl_Position is not written. - SH_INIT_GL_POSITION = 0x10000, + SH_INIT_GL_POSITION = 0x8000, // This flag replaces // "a && b" with "a ? b : false", // "a || b" with "a ? true : b". // This is to work around a MacOSX driver bug that |b| is executed // independent of |a|'s value. - SH_UNFOLD_SHORT_CIRCUIT = 0x20000, + SH_UNFOLD_SHORT_CIRCUIT = 0x10000, // This flag initializes varyings without static use in vertex shader // at the beginning of main(), and has no effects in the fragment shader. // It is intended as a workaround for drivers which incorrectly optimize // out such varyings and cause a link failure. - SH_INIT_VARYINGS_WITHOUT_STATIC_USE = 0x40000, + SH_INIT_VARYINGS_WITHOUT_STATIC_USE = 0x20000, } ShCompileOptions; // Defines alternate strategies for implementing array index clamping. |