From da4a6bbbeada8e4c9165f27961c54a28c7d78915 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 11 Feb 2016 15:11:38 -0800 Subject: [PATCH] gen8/pipeline: Pull gs_vertex_count from prog_data --- src/vulkan/anv_pipeline.c | 1 - src/vulkan/anv_private.h | 1 - src/vulkan/gen8_pipeline.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c index 4e75557f48d..1b70b18fba1 100644 --- 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 ad34772b081..29d3c82b9b9 100644 --- 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 e31966f7d85..e796ab3d51d 100644 --- 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), -- 2.30.2