From 7ad091b02c52f82f2e5ac2d472101f50383f21f5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 25 Apr 2024 17:27:58 -0400 Subject: [PATCH] intel: Build float64 shader only for Vulkan It's only used by anv and it requires glslang, which isn't otherwise required for building iris. Fixes: b52e25d3a8e ("anv: rewrite internal shaders using OpenCL") Part-of: (cherry picked from commit 2a417e3fc1911f5edc912621fe532c1c3ec64d0b) --- .pick_status.json | 2 +- src/intel/shaders/meson.build | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 17c1220374e..c2167db49af 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -344,7 +344,7 @@ "description": "intel: Build float64 shader only for Vulkan", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b52e25d3a8eee702ff5d21e4cdb9a4dc0736282a", "notes": null diff --git a/src/intel/shaders/meson.build b/src/intel/shaders/meson.build index be98e67d43a..e8e2c311324 100644 --- a/src/intel/shaders/meson.build +++ b/src/intel/shaders/meson.build @@ -1,19 +1,21 @@ # Copyright © 2023 Intel Corporation # SPDX-License-Identifier: MIT -intel_float64_spv_h = custom_target( - 'float64_spv.h', - input : [glsl2spirv, float64_glsl_file], - output : 'float64_spv.h', - command : [ - prog_python, '@INPUT@', '@OUTPUT@', - prog_glslang, - '--create-entry', 'main', - '--vn', 'float64_spv_source', - '--glsl-version', '450', - '-Olib', - ] -) +if with_intel_vk + intel_float64_spv_h = custom_target( + 'float64_spv.h', + input : [glsl2spirv, float64_glsl_file], + output : 'float64_spv.h', + command : [ + prog_python, '@INPUT@', '@OUTPUT@', + prog_glslang, + '--create-entry', 'main', + '--vn', 'float64_spv_source', + '--glsl-version', '450', + '-Olib', + ] + ) +endif intel_shader_files = files( 'libintel_shaders.h',