Attachment 110323 Details for Bug 82585 – Patch that may fix the problem

[patch] Patch that may fix the problem

0001-linker-Assign-locations-for-SSO-GS-inputs.patch (text/plain), 1.49 KB, created by Ian Romanick on 2014-12-01 22:08:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2014-12-01 22:08:30 UTC

Size: 1.49 KB

patch

obsolete

>From 1f0073645137f612d0a106f3dd305ab22a0ef516 Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Mon, 1 Dec 2014 14:07:30 -0800
>Subject: [PATCH] linker: Assign locations for SSO GS inputs
>
>---
> src/glsl/linker.cpp | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
>diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>index de6b1fb..6713df1 100644
>--- a/src/glsl/linker.cpp
>+++ b/src/glsl/linker.cpp
>@@ -2746,6 +2746,21 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
>    if (last >= 0 && last < MESA_SHADER_FRAGMENT) {
>       gl_shader *const sh = prog->_LinkedShaders[last];
> 
>+      if (first == MESA_SHADER_GEOMETRY) {
>+         /* There was no vertex shader, but we still have to assign varying
>+          * locations for use by geometry shader inputs in SSO.
>+          *
>+          * If the shader is not separable (i.e., prog->SeparateShader is
>+          * false), linking will have already failed when first is
>+          * MESA_SHADER_GEOMETRY.
>+          */
>+         if (!assign_varying_locations(ctx, mem_ctx, prog,
>+                                       NULL, sh,
>+                                       num_tfeedback_decls, tfeedback_decls,
>+                                       prog->Geom.VerticesIn))
>+            goto done;
>+      }
>+
>       if (num_tfeedback_decls != 0 || prog->SeparateShader) {
>          /* There was no fragment shader, but we still have to assign varying
>           * locations for use by transform feedback.
>-- 
>1.8.1.4
>

Actions: View | Splinter Review

Attachments on bug 82585: 105265 | 105268 | 105270 | 109813 | 109814 | 110323

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.