From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Thu, 13 Oct 2016 04:16:49 +0000 (+1100)
Subject: compiler: add input primative field for gs in shader info
X-Git-Tag: android-x86-6.0-r3~2538
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b99ecaf8724cf7fac29dbc2851c3be13d0fed5b2;p=android-x86%2Fexternal-mesa.git

compiler: add input primative field for gs in shader info

And copy the value from GLSL.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c
index 2da97578548..fc4484adfd5 100644
--- a/src/compiler/shader_info.c
+++ b/src/compiler/shader_info.c
@@ -43,6 +43,7 @@ copy_shader_info(const struct gl_shader_program *shader_prog,
    case MESA_SHADER_GEOMETRY:
       info->gs.vertices_in = shader_prog->Geom.VerticesIn;
       info->gs.output_primitive = sh->info.Geom.OutputType;
+      info->gs.input_primitive = sh->info.Geom.InputType;
       info->gs.vertices_out = sh->info.Geom.VerticesOut;
       info->gs.invocations = sh->info.Geom.Invocations;
       info->gs.uses_end_primitive = shader_prog->Geom.UsesEndPrimitive;
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index 5eae8f13f46..a44fcac2388 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -82,6 +82,9 @@ typedef struct shader_info {
          /** The output primitive type (GL enum value) */
          unsigned output_primitive;
 
+         /** The input primitive type (GL enum value) */
+         unsigned input_primitive;
+
          /** The maximum number of vertices the geometry shader might write. */
          unsigned vertices_out;