fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler/clc: Null extensions should mean all supported, not all

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13177>
This commit is contained in:
Jesse Natalie 2021-10-04 09:29:22 -07:00 • committed by Marge Bot
parent b8cafaa91d
commit 3a752256f5
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/compiler/clc/clc_helpers.cpp
View file

@ -890,21 +890,29 @@ llvm_mod_to_spirv(std::unique_ptr<::llvm::Module> mod,
return -1;
}
SPIRV::TranslatorOpts spirv_opts;
if (!args || !args->allowed_spirv_extensions) {
spirv_opts = SPIRV::TranslatorOpts(version);
spirv_opts.enableAllExtensions();
} else {
SPIRV::TranslatorOpts::ExtensionsStatusMap ext_map;
for (int i = 0; args->allowed_spirv_extensions[i]; i++) {
const char *const *extensions = NULL;
if (args)
extensions = args->allowed_spirv_extensions;
if (!extensions) {
/* The SPIR-V parser doesn't handle all extensions */
static const char *default_extensions[] = {
"SPV_EXT_shader_atomic_float_add",
"SPV_EXT_shader_atomic_float_min_max",
"SPV_KHR_float_controls",
NULL,
};
extensions = default_extensions;
}
SPIRV::TranslatorOpts::ExtensionsStatusMap ext_map;
for (int i = 0; extensions[i]; i++) {
#define EXT(X) \
if (strcmp(#X, args->allowed_spirv_extensions[i]) == 0) \
ext_map.insert(std::make_pair(SPIRV::ExtensionID::X, true));
if (strcmp(#X, extensions[i]) == 0) \
ext_map.insert(std::make_pair(SPIRV::ExtensionID::X, true));
#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
#undef EXT
}
spirv_opts = SPIRV::TranslatorOpts(version, ext_map);
}
SPIRV::TranslatorOpts spirv_opts = SPIRV::TranslatorOpts(version, ext_map);
std::ostringstream spv_stream;
if (!::llvm::writeSpirv(mod.get(), spirv_opts, spv_stream, log)) {