diff options
| author | John Kessenich <cepheus@frii.com> | 2019-08-07 01:52:20 -0600 |
|---|---|---|
| committer | John Kessenich <cepheus@frii.com> | 2019-08-20 23:21:56 -0600 |
| commit | eaf449631289471d2bb3ed4d9aae52f802967993 (patch) | |
| tree | e114f5801be394f36cc4e3b5b33109dcea5c4759 /SPIRV | |
| parent | 441b2ac4d16ef5370bd7d2143bd77870cfc8ff74 (diff) | |
| download | glslang-eaf449631289471d2bb3ed4d9aae52f802967993.tar.gz | |
Web: Complete the removal of vendor-specific #ifdef's, including CMake.
Diffstat (limited to 'SPIRV')
| -rw-r--r-- | SPIRV/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | SPIRV/SpvBuilder.cpp | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index 594ab1ef..94d2ebeb 100644 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -25,24 +25,14 @@ set(HEADERS spvIR.h doc.h SpvTools.h - disassemble.h) + disassemble.h + GLSL.ext.AMD.h + GLSL.ext.NV.h) set(SPVREMAP_HEADERS SPVRemapper.h doc.h) -if(ENABLE_AMD_EXTENSIONS) - list(APPEND - HEADERS - GLSL.ext.AMD.h) -endif(ENABLE_AMD_EXTENSIONS) - -if(ENABLE_NV_EXTENSIONS) - list(APPEND - HEADERS - GLSL.ext.NV.h) -endif(ENABLE_NV_EXTENSIONS) - add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp index 95b1f4ff..52fbc630 100644 --- a/SPIRV/SpvBuilder.cpp +++ b/SPIRV/SpvBuilder.cpp @@ -1826,7 +1826,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse, if (parameters.component != NoResult) texArgs[numArgs++] = parameters.component; -#ifdef NV_EXTENSIONS +#ifndef GLSLANG_WEB if (parameters.granularity != NoResult) texArgs[numArgs++] = parameters.granularity; if (parameters.coarse != NoResult) |