Mesa (master): glsl: Merge blend_support qualifiers when linking.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Aug 26 03:05:54 UTC 2016


Module: Mesa
Branch: master
Commit: 80df3c030e061aa8b72f7032125532ce98524d0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80df3c030e061aa8b72f7032125532ce98524d0c

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jun 28 10:02:06 2016 -0700

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 <kenneth at whitecape.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/compiler/glsl/linker.cpp | 2 ++
 1 file changed, 2 insertions(+)

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;
    }
 }
 




More information about the mesa-commit mailing list