OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clover/nir: don't convert to NIR on library link

Browse Source 
If just creating a library, just link the spir-v and store it.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12286>
This commit is contained in:
Dave Airlie
2021-08-09 11:36:58 +10:00
committed by Marge Bot
parent 6cc1568ff5
commit e78d5bb8e2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/frontends/clover/core/compiler.hpp
View File

@@ -62,10 +62,16 @@ namespace clover {
static inline module static inline module
link_program(const std::vector<module> &ms, const device &dev, link_program(const std::vector<module> &ms, const device &dev,
const std::string &opts, std::string &log) { const std::string &opts, std::string &log) {
const bool create_library =
opts.find("-create-library") != std::string::npos;
switch (dev.ir_format()) { switch (dev.ir_format()) {
case PIPE_SHADER_IR_NIR_SERIALIZED: case PIPE_SHADER_IR_NIR_SERIALIZED: {
return nir::spirv_to_nir(spirv::link_program(ms, dev, opts, log), auto spirv_linked_module = spirv::link_program(ms, dev, opts, log);
if (create_library)
return spirv_linked_module;
return nir::spirv_to_nir(spirv_linked_module,
dev, log); dev, log);
}
case PIPE_SHADER_IR_NATIVE: case PIPE_SHADER_IR_NATIVE:
return llvm::link_program(ms, dev, opts, log); return llvm::link_program(ms, dev, opts, log);
default: default: