mirror of
https://gitee.com/openharmony/third_party_vulkan-loader
synced 2024-11-23 07:10:23 +00:00
build: Update glslang to e4821e
This includes applying a patch to glslang to revert glslang commit a5c33d, which fixes a texel fetch problem that many IHV drivers are not ready to cope with yet.
This commit is contained in:
parent
4b7dbfbef8
commit
1ac14a5f58
@ -217,15 +217,15 @@ if (WIN32)
|
||||
add_library(Loader STATIC IMPORTED)
|
||||
add_library(SPIRV-Tools STATIC IMPORTED)
|
||||
|
||||
find_library(GLSLANG_DLIB NAMES glslang
|
||||
find_library(GLSLANG_DLIB NAMES glslangd
|
||||
HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
|
||||
find_library(OGLCompiler_DLIB NAMES OGLCompiler
|
||||
find_library(OGLCompiler_DLIB NAMES OGLCompilerd
|
||||
HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
|
||||
find_library(OSDependent_DLIB NAMES OSDependent
|
||||
find_library(OSDependent_DLIB NAMES OSDependentd
|
||||
HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
|
||||
find_library(HLSL_DLIB NAMES HLSL
|
||||
find_library(HLSL_DLIB NAMES HLSLd
|
||||
HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
|
||||
find_library(SPIRV_DLIB NAMES SPIRV
|
||||
find_library(SPIRV_DLIB NAMES SPIRVd
|
||||
HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
|
||||
find_library(SPIRV_TOOLS_DLIB NAMES SPIRV-Tools
|
||||
HINTS ${SPIRV_TOOLS_DEBUG_SEARCH_PATH} )
|
||||
|
18
glslang_revert_a5c33d.patch.txt
Normal file
18
glslang_revert_a5c33d.patch.txt
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
|
||||
index dd11304..aebc986 100755
|
||||
--- a/SPIRV/GlslangToSpv.cpp
|
||||
+++ b/SPIRV/GlslangToSpv.cpp
|
||||
@@ -2630,13 +2630,6 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
|
||||
bias = true;
|
||||
}
|
||||
|
||||
- // See if the sampler param should really be just the SPV image part
|
||||
- if (cracked.fetch) {
|
||||
- // a fetch needs to have the image extracted first
|
||||
- if (builder.isSampledImage(params.sampler))
|
||||
- params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
|
||||
- }
|
||||
-
|
||||
// set the rest of the arguments
|
||||
|
||||
params.coords = arguments[1];
|
@ -1 +1 @@
|
||||
4678ca9dacfec7a084dbc69bbe568bdad6889f1b
|
||||
e4821e43c86d97bcf65fb07c1f70471b7102978d
|
||||
|
Loading…
Reference in New Issue
Block a user