diff options
| author | Mark Young <marky@lunarg.com> | 2016-08-25 20:12:05 -0600 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2016-08-26 07:50:31 -0600 |
| commit | e77704f5e6eb2207ade01a8489b42408923a1b2e (patch) | |
| tree | c53ab2678e319f01916ac8f5413fcb5285f9014d | |
| parent | cb8cee021ad6615d105a4d6f852952bc30f64240 (diff) | |
| download | usermoji-e77704f5e6eb2207ade01a8489b42408923a1b2e.tar.xz | |
glslang: Remove change to revert texel fetch fix.
Previously, we had to revert a texel fetch fix in glslang as
part of the update_external_sources.bat/sh due to a bug in the
certain drivers. The drivers have been fixed and released so
we can remove the change.
Change-Id: I018a0dbbc5fb27d7fbd91bc3073f0f5bef5cd346
| -rw-r--r-- | glslang_revert_a5c33d.patch.txt | 18 | ||||
| -rw-r--r-- | update_external_sources.bat | 3 | ||||
| -rwxr-xr-x | update_external_sources.sh | 9 |
3 files changed, 0 insertions, 30 deletions
diff --git a/glslang_revert_a5c33d.patch.txt b/glslang_revert_a5c33d.patch.txt deleted file mode 100644 index 0d7075c3..00000000 --- a/glslang_revert_a5c33d.patch.txt +++ /dev/null @@ -1,18 +0,0 @@ -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]; diff --git a/update_external_sources.bat b/update_external_sources.bat index 62bded1f..4775af7e 100644 --- a/update_external_sources.bat +++ b/update_external_sources.bat @@ -217,9 +217,6 @@ goto:eof cd %GLSLANG_DIR% git fetch --all git checkout %GLSLANG_REVISION% - REM Revert glslang a5c33d6ffb34ccede5b233bc724c907166b6e479 - REM See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/681 - git apply --whitespace=fix %BUILD_DIR%\glslang_revert_a5c33d.patch.txt goto:eof :create_spirv-tools diff --git a/update_external_sources.sh b/update_external_sources.sh index 59197f09..640a5989 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -27,15 +27,6 @@ function update_glslang () { cd $BASEDIR/glslang git fetch --all git checkout $GLSLANG_REVISION - # Revert glslang a5c33d6ffb34ccede5b233bc724c907166b6e479 - # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/681 - git diff-index --quiet HEAD | true - rc=${PIPESTATUS[0]} - if (( $rc == 0 )) - then - echo "applying patch to revert glslang a5c33d" - git apply $BUILDDIR/glslang_revert_a5c33d.patch.txt - fi } function create_spirv-tools () { |