From 91dfc025707bdde270bdfafa20e063ecf68f7fc7 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 10 Nov 2022 11:34:50 +0200 Subject: [PATCH] anv: fixup invalid enum for nir environment MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also switching away from PIPE_ Signed-off-by: Lionel Landwerlin Fixes: 8c4c4c3ee1a2 ("anv: Add softtp64 workaround") Reviewed-by: José Roberto de Souza Part-of: (cherry picked from commit 68fd9d28294ee91033690b2288c55480c4125577) --- .pick_status.json | 2 +- src/intel/vulkan/anv_pipeline_cache.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a0d7454..a3bf13a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3307,7 +3307,7 @@ "description": "anv: fixup invalid enum for nir environment", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8c4c4c3ee1a24b73fa29f30a05e873e9e13dddc7" }, diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c index 0c162a4..e3894df 100644 --- a/src/intel/vulkan/anv_pipeline_cache.c +++ b/src/intel/vulkan/anv_pipeline_cache.c @@ -446,13 +446,13 @@ anv_load_fp64_shader(struct anv_device *device) .int16 = true, .int64 = true, }, - .environment = MESA_SHADER_VERTEX, + .environment = NIR_SPIRV_VULKAN, .create_library = true }; nir_shader* nir = spirv_to_nir(float64_spv_source, sizeof(float64_spv_source) / 4, - NULL, 0, PIPE_SHADER_VERTEX, "main", + NULL, 0, MESA_SHADER_VERTEX, "main", &spirv_options, nir_options); assert(nir != NULL); -- 2.7.4