fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: allow conservative depth qualifiers in GLSL 420

Browse source 
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ilia Mirkin 2016-04-02 21:08:25 -04:00
parent d50ffb5e46
commit 87906cbc37
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/glsl/ast_to_hir.cpp
View file

@ -3326,6 +3326,7 @@ apply_layout_qualifier_to_variable(const struct ast_type_qualifier *qual,
+ qual->flags.q.depth_less + qual->flags.q.depth_less
+ qual->flags.q.depth_unchanged; + qual->flags.q.depth_unchanged;
if (depth_layout_count > 0 if (depth_layout_count > 0
&& !state->is_version(420, 0)
&& !state->AMD_conservative_depth_enable && !state->AMD_conservative_depth_enable
&& !state->ARB_conservative_depth_enable) { && !state->ARB_conservative_depth_enable) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
@ -3708,7 +3709,8 @@ get_variable_being_redeclared(ir_variable *var, YYLTYPE loc,
earlier->data.interpolation = var->data.interpolation; earlier->data.interpolation = var->data.interpolation;
/* Layout qualifiers for gl_FragDepth. */ /* Layout qualifiers for gl_FragDepth. */
} else if ((state->AMD_conservative_depth_enable || } else if ((state->is_version(420, 0) ||
state->AMD_conservative_depth_enable ||
state->ARB_conservative_depth_enable) state->ARB_conservative_depth_enable)
&& strcmp(var->name, "gl_FragDepth") == 0 && strcmp(var->name, "gl_FragDepth") == 0
&& earlier->type == var->type && earlier->type == var->type