Attachment 105695 Details for Bug 83380 – Patch v2

[patch] Patch v2

0001-Linking-fails-when-not-writing-gl_Position.patch (text/plain), 1.65 KB, created by kalyank on 2014-09-03 15:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kalyank

Created: 2014-09-03 15:21:39 UTC

Size: 1.65 KB

patch

obsolete

>From f2231d34377e0595de177ca09d77239c607e80a2 Mon Sep 17 00:00:00 2001
>From: Kalyan Kondapally <kalyan.kondapally@intel.com>
>Date: Wed, 3 Sep 2014 08:07:28 -0700
>Subject: [PATCH] Linking fails when not writing gl_Position.
>
>According to GLSL-ES Spec(i.e. 1.0, 3.0), gl_Position value is undefined
>after the vertex processing stage if we don't write gl_Position. However,
>GLSL 1.10 Spec mentions that writing to gl_Position is mandatory. In case
>of GLSL-ES, it's not an error and atleast the linking should pass.
>Currently, Mesa throws an linker error in case we dont write to gl_position
>and Version is less then 140(GLSL) and 300(GLSL-ES). This patch changes
>it so that we don't report an error in case of GLSL-ES.
>
>Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
>---
> src/glsl/linker.cpp |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>index 57be493..e9cf550 100644
>--- a/src/glsl/linker.cpp
>+++ b/src/glsl/linker.cpp
>@@ -559,10 +559,10 @@ validate_vertex_shader_executable(struct gl_shader_program *prog,
>     *      vertex processing has occurred. Its value is undefined if
>     *      the vertex shader executable does not write gl_Position."
>     *
>-    * GLSL ES 3.00 is similar to GLSL 1.40--failing to write to gl_Position is
>-    * not an error.
>+    * All GLSL ES Versions are similar to GLSL 1.40--failing to write to
>+    * gl_Position is not an error.
>     */
>-   if (prog->Version < (prog->IsES ? 300 : 140)) {
>+   if (!prog->IsES && prog->Version < 140) {
>       find_assignment_visitor find("gl_Position");
>       find.run(shader->ir);
>       if (!find.variable_found()) {
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 83380: 105583 | 105695

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.