From: Neil Roberts <nroberts@igalia.com>
Date: Mon, 18 Dec 2017 18:00:17 +0000 (+0100)
Subject: mesa/glspirv: Set last_vert_prog
X-Git-Tag: upstream/19.0.0~3487
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d480623bef7cfc632af166a304eb104928c73520;p=platform%2Fupstream%2Fmesa.git

mesa/glspirv: Set last_vert_prog

v2: simplify last_vert check (Timothy)

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c
index 8ad6c37..ed7ff29 100644
--- a/src/mesa/main/glspirv.c
+++ b/src/mesa/main/glspirv.c
@@ -173,6 +173,13 @@ _mesa_spirv_link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
       prog->_LinkedShaders[shader_type] = linked;
       prog->data->linked_stages |= 1 << shader_type;
    }
+
+   int last_vert_stage =
+      util_last_bit(prog->data->linked_stages &
+                    ((1 << (MESA_SHADER_GEOMETRY + 1)) - 1));
+
+   if (last_vert_stage)
+      prog->last_vert_prog = prog->_LinkedShaders[last_vert_stage - 1]->Program;
 }
 
 nir_shader *