Mesa (master): glsl/linker: Allow fragment output overlap for gl_LastFragData.

Francisco Jerez currojerez at kemper.freedesktop.org
Wed Aug 24 20:31:43 UTC 2016


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

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Thu Jul 14 12:57:14 2016 -0700

glsl/linker: Allow fragment output overlap for gl_LastFragData.

gl_LastFragData overlaps gl_FragData by definition.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

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

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index a1a65ef..4b404ff 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -2673,6 +2673,9 @@ assign_attribute_or_color_locations(void *mem_ctx,
          }
       }
 
+      if (strcmp(var->name, "gl_LastFragData") == 0)
+         continue;
+
       /* From GL4.5 core spec, section 15.2 (Shader Execution):
        *
        *     "Output binding assignments will cause LinkProgram to fail:




More information about the mesa-commit mailing list