diff options
| author | Tobias Klausmann <[email protected]> | 2016-05-08 22:44:02 +0200 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-05-14 08:27:29 +1000 |
| commit | eb18fea707fd7859e712ee7279e9acc68e177ceb (patch) | |
| tree | e928ace24b11d6aeae7b9aad2576e38f088a7e67 /src/compiler/glsl | |
| parent | f2a2e08e01b9bfe64a7259f46a0f502d486c8dad (diff) | |
mesa/main: Add support for GL_ARB_cull_distance (v2)
airlied:
v2: rename LowerClipDistance to LowerCombinedClipCullDistnace.
I don't think we want any other behaviour with any current hw.
Signed-off-by: Tobias Klausmann <[email protected]>
Reviewed-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_clip_distance.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 34e82c71d56..2555cc94176 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -627,7 +627,7 @@ tfeedback_decl::init(struct gl_context *ctx, const void *mem_ctx, * class must behave specially to account for the fact that gl_ClipDistance * is converted from a float[8] to a vec4[2]. */ - if (ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].LowerClipDistance && + if (ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].LowerCombinedClipCullDistance && strcmp(this->var_name, "gl_ClipDistance") == 0) { this->lowered_builtin_array_variable = clip_distance; } diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 0268b748a10..2a520bc0013 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4560,7 +4560,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) if (!prog->LinkStatus) goto done; - if (ctx->Const.ShaderCompilerOptions[i].LowerClipDistance) { + if (ctx->Const.ShaderCompilerOptions[i].LowerCombinedClipCullDistance) { lower_clip_distance(prog->_LinkedShaders[i]); } diff --git a/src/compiler/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp index 1ada215796c..5d9468dcd63 100644 --- a/src/compiler/glsl/lower_clip_distance.cpp +++ b/src/compiler/glsl/lower_clip_distance.cpp @@ -42,7 +42,7 @@ * * Since some hardware may not internally represent gl_ClipDistance as a pair * of vec4's, this lowering pass is optional. To enable it, set the - * LowerClipDistance flag in gl_shader_compiler_options to true. + * LowerCombinedClipCullDistance flag in gl_shader_compiler_options to true. */ #include "glsl_symbol_table.h" |