From: Kenneth Graunke Date: Tue, 28 Jun 2016 17:02:06 +0000 (-0700) Subject: glsl: Merge blend_support qualifiers when linking. X-Git-Tag: upstream/17.1.0~6980 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80df3c030e061aa8b72f7032125532ce98524d0c;p=platform%2Fupstream%2Fmesa.git glsl: Merge blend_support qualifiers when linking. Since each qualifier represents a blending mode the shader can be used with, we take the union of all possible modes when linking. Signed-off-by: Kenneth Graunke Reviewed-by: Francisco Jerez --- diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 4b404ff..436b452 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1880,6 +1880,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->info.uses_gl_fragcoord = false; linked_shader->info.origin_upper_left = false; linked_shader->info.pixel_center_integer = false; + linked_shader->info.BlendSupport = 0; if (linked_shader->Stage != MESA_SHADER_FRAGMENT || (prog->Version < 150 && !prog->ARB_fragment_coord_conventions_enable)) @@ -1938,6 +1939,7 @@ link_fs_inout_layout_qualifiers(struct gl_shader_program *prog, linked_shader->info.EarlyFragmentTests |= shader->info.EarlyFragmentTests; + linked_shader->info.BlendSupport |= shader->info.BlendSupport; } }