gen8/pipeline: Pull gs_vertex_count from prog_data

diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c
index 4e75557f48d2a81684c79e2b8b03e39c5bfb4166..1b70b18fba124841cc12f63c2963dbe01ca24e1e 100644 (file)
--- a/src/vulkan/anv_pipeline.c
+++ b/src/vulkan/anv_pipeline.c
@@ -635,7 +635,6 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
    /* TODO: SIMD8 GS */
    pipeline->gs_kernel =
       anv_pipeline_cache_upload_kernel(cache, shader_code, code_size);
-   pipeline->gs_vertex_count = nir->info.gs.vertices_in;
 
    ralloc_free(mem_ctx);
 

diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index ad34772b081d22e69553de05ab14d77db8b12ab1..29d3c82b9b991c6e734e4dee83d41a5aedc0ec80 100644 (file)
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -1379,7 +1379,6 @@ struct anv_pipeline {
    uint32_t                                     ps_grf_start0;
    uint32_t                                     ps_grf_start2;
    uint32_t                                     gs_kernel;
-   uint32_t                                     gs_vertex_count;
    uint32_t                                     cs_simd;
 
    uint32_t                                     vb_used;

diff --git a/src/vulkan/gen8_pipeline.c b/src/vulkan/gen8_pipeline.c
index e31966f7d85390f1f3dce619eb1c4fb6f684986e..e796ab3d51da2e93efaf90a6159bb5d55d6cf41f 100644 (file)
--- a/src/vulkan/gen8_pipeline.c
+++ b/src/vulkan/gen8_pipeline.c
@@ -322,7 +322,7 @@ genX(graphics_pipeline_create)(
                      .VectorMaskEnable = false,
                      .SamplerCount = 0,
                      .BindingTableEntryCount = 0,
-                     .ExpectedVertexCount = pipeline->gs_vertex_count,
+                     .ExpectedVertexCount = gs_prog_data->vertices_in,
 
                      .ScratchSpaceBasePointer = pipeline->scratch_start[MESA_SHADER_GEOMETRY],
                      .PerThreadScratchSpace = scratch_space(&gs_prog_data->base.base),