diff --git a/src/nouveau/vulkan/nvk_compute_pipeline.c b/src/nouveau/vulkan/nvk_compute_pipeline.c index 68a6eabd736..d73eec7a409 100644 --- a/src/nouveau/vulkan/nvk_compute_pipeline.c +++ b/src/nouveau/vulkan/nvk_compute_pipeline.c @@ -190,9 +190,8 @@ nvk_compute_pipeline_create(struct nvk_device *device, nvk_lower_nir(device, nir, &robustness, false, pipeline_layout); - struct nvk_pipeline_compilation_ctx ctx = { 0 }; result = nvk_compile_nir(pdevice, nir, NULL, - &pipeline->base.shaders[MESA_SHADER_COMPUTE], &ctx); + &pipeline->base.shaders[MESA_SHADER_COMPUTE]); ralloc_free(nir); if (result != VK_SUCCESS) goto fail; diff --git a/src/nouveau/vulkan/nvk_graphics_pipeline.c b/src/nouveau/vulkan/nvk_graphics_pipeline.c index 5c5379926cd..dd048c2e911 100644 --- a/src/nouveau/vulkan/nvk_graphics_pipeline.c +++ b/src/nouveau/vulkan/nvk_graphics_pipeline.c @@ -337,10 +337,6 @@ nvk_graphics_pipeline_create(struct nvk_device *device, state.rp->view_mask != 0, pipeline_layout); } - struct nvk_pipeline_compilation_ctx ctx = { - .tesc_domain = MESA_PRIM_POINTS, - }; - for (gl_shader_stage stage = 0; stage < MESA_SHADER_STAGES; stage++) { if (nir[stage] == NULL) continue; @@ -352,7 +348,7 @@ nvk_graphics_pipeline_create(struct nvk_device *device, } result = nvk_compile_nir(pdevice, nir[stage], fs_key, - &pipeline->base.shaders[stage], &ctx); + &pipeline->base.shaders[stage]); ralloc_free(nir[stage]); if (result != VK_SUCCESS) goto fail; diff --git a/src/nouveau/vulkan/nvk_pipeline.h b/src/nouveau/vulkan/nvk_pipeline.h index de1169ec80b..3313e0a3df0 100644 --- a/src/nouveau/vulkan/nvk_pipeline.h +++ b/src/nouveau/vulkan/nvk_pipeline.h @@ -65,9 +65,4 @@ nvk_graphics_pipeline_create(struct nvk_device *device, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipeline); -struct nvk_pipeline_compilation_ctx { - uint8_t tesc_domain; // MESA_PRIM_{POINTS, QUADS, TRIANGLES, LINES} -}; - - #endif diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index 719d5271ac2..21feb314053 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -1055,8 +1055,7 @@ nvk_fill_transform_feedback_state(struct nir_shader *nir, VkResult nvk_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir, const struct nvk_fs_key *fs_key, - struct nvk_shader *shader, - struct nvk_pipeline_compilation_ctx *ctx) + struct nvk_shader *shader) { struct nv50_ir_prog_info *info; struct nv50_ir_prog_info_out info_out = {}; @@ -1079,9 +1078,6 @@ nvk_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir, info->io.auxCBSlot = 1; info->io.uboInfoBase = 0; info->io.drawInfoBase = 0; - if (nir->info.stage == MESA_SHADER_TESS_EVAL) { - info->prop.tese.prespecified_domain = ctx->tesc_domain; - } if (nir->info.stage == MESA_SHADER_COMPUTE) { info->prop.cp.gridInfoBase = 0; } else { @@ -1155,10 +1151,6 @@ nvk_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir, } } - if (info->type == PIPE_SHADER_TESS_CTRL) { - ctx->tesc_domain = info_out.prop.tp.domain; - } - return VK_SUCCESS; } diff --git a/src/nouveau/vulkan/nvk_shader.h b/src/nouveau/vulkan/nvk_shader.h index afaf951f506..1a066af615c 100644 --- a/src/nouveau/vulkan/nvk_shader.h +++ b/src/nouveau/vulkan/nvk_shader.h @@ -126,8 +126,7 @@ nvk_lower_nir(struct nvk_device *device, nir_shader *nir, VkResult nvk_compile_nir(struct nvk_physical_device *device, nir_shader *nir, const struct nvk_fs_key *fs_key, - struct nvk_shader *shader, - struct nvk_pipeline_compilation_ctx *ctx); + struct nvk_shader *shader); VkResult nvk_shader_upload(struct nvk_device *dev, struct nvk_shader *shader);