From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 11 Dec 2015 06:37:27 +0000 (-0800)
Subject: anv/pipeline: Get rid of the no kernel input parameters hack
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ae4e59faca7875322a9a8a64e9d7b4a5a87ed48;p=mesa.git

anv/pipeline: Get rid of the no kernel input parameters hack

Previously, meta would pass null shaders in for the VS when it intended to
disable the VS.  However, this meant that we didn't know what inputs we had
and would dead-code things in the FS.  In order to solve this, we
hard-coded a number.  Now meta passes in a VS even if it plans to disable
the stage so this is no longer needed.
---

diff --git a/src/vulkan/gen8_pipeline.c b/src/vulkan/gen8_pipeline.c
index faf997a4304..85b1e15a0f6 100644
--- a/src/vulkan/gen8_pipeline.c
+++ b/src/vulkan/gen8_pipeline.c
@@ -353,15 +353,6 @@ genX(graphics_pipeline_create)(
    if (result != VK_SUCCESS)
       return result;
 
-   /* FIXME: The compiler dead-codes FS inputs when we don't have a VS, so we
-    * hard code this to num_attributes - 2. This is because the attributes
-    * include VUE header and position, which aren't counted as varying
-    * inputs. */
-   if (pipeline->vs_simd8 == NO_KERNEL) {
-      pipeline->wm_prog_data.num_varying_inputs =
-         pCreateInfo->pVertexInputState->vertexAttributeDescriptionCount - 2;
-   }
-
    assert(pCreateInfo->pVertexInputState);
    emit_vertex_input(pipeline, pCreateInfo->pVertexInputState);
    assert(pCreateInfo->pInputAssemblyState);