diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-16 01:41:21 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-16 01:41:21 +0100 |
| commit | fa816e1ec69d865114b7d061905574038fbd425b (patch) | |
| tree | 994afe16239f5297e7a76110cdfd88d26b768071 /dom/canvas | |
| parent | 7007ec9e42bf443566846296aa70aba47ee9feb3 (diff) | |
| download | uxp-fa816e1ec69d865114b7d061905574038fbd425b.tar.gz | |
No issue - Fix some line endings in WebGLShaderValidator.cpp
Diffstat (limited to 'dom/canvas')
| -rw-r--r-- | dom/canvas/WebGLShaderValidator.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/dom/canvas/WebGLShaderValidator.cpp b/dom/canvas/WebGLShaderValidator.cpp index d574d9a659..bf2df82f71 100644 --- a/dom/canvas/WebGLShaderValidator.cpp +++ b/dom/canvas/WebGLShaderValidator.cpp @@ -33,14 +33,14 @@ static int ChooseValidatorCompileOptions(const ShBuiltInResources& resources, const mozilla::gl::GLContext* gl) { - int options = SH_VARIABLES |
- SH_ENFORCE_PACKING_RESTRICTIONS |
+ int options = SH_VARIABLES | + SH_ENFORCE_PACKING_RESTRICTIONS | SH_INIT_VARYINGS_WITHOUT_STATIC_USE | - SH_OBJECT_CODE |
- SH_INIT_GL_POSITION;
-
- if (resources.MaxExpressionComplexity > 0) {
- options |= SH_LIMIT_EXPRESSION_COMPLEXITY;
+ SH_OBJECT_CODE | + SH_INIT_GL_POSITION; + + if (resources.MaxExpressionComplexity > 0) { + options |= SH_LIMIT_EXPRESSION_COMPLEXITY; } // Sampler arrays indexed with non-constant expressions are forbidden in // GLSL 1.30 and later. @@ -51,17 +51,17 @@ ChooseValidatorCompileOptions(const ShBuiltInResources& resources, // Needed for driver bug detection options |= SH_EMULATE_BUILT_IN_FUNCTIONS; - if (gfxPrefs::WebGLAllANGLEOptions()) {
- return options |
- SH_VALIDATE_LOOP_INDEXING |
- SH_UNROLL_FOR_LOOP_WITH_INTEGER_INDEX |
- SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX |
- SH_CLAMP_INDIRECT_ARRAY_BOUNDS |
- SH_UNFOLD_SHORT_CIRCUIT |
- SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS |
- SH_INIT_OUTPUT_VARIABLES |
- SH_REGENERATE_STRUCT_NAMES;
- }
+ if (gfxPrefs::WebGLAllANGLEOptions()) { + return options | + SH_VALIDATE_LOOP_INDEXING | + SH_UNROLL_FOR_LOOP_WITH_INTEGER_INDEX | + SH_UNROLL_FOR_LOOP_WITH_SAMPLER_ARRAY_INDEX | + SH_CLAMP_INDIRECT_ARRAY_BOUNDS | + SH_UNFOLD_SHORT_CIRCUIT | + SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS | + SH_INIT_OUTPUT_VARIABLES | + SH_REGENERATE_STRUCT_NAMES; + } #ifndef XP_MACOSX // We want to do this everywhere, but to do this on Mac, we need |