diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-23 12:12:46 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-23 10:29:32 +0000 |
| commit | 3ed14d7b0d539f97f2d68c83cc02d6509b24aea7 (patch) | |
| tree | 625ec2e44616e9915ab73b0c4112b83e0b54ea74 | |
| parent | d1286d7a44fa61f37923d3d47550355962be0008 (diff) | |
Disable unused arg warning in release builds
Change-Id: Ib68abb9658ae2bb2374071ce3f11e04cffae05c0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h | 2 | ||||
| -rw-r--r-- | src/glslang/patches/0001-Disable-unused-arg-warning-in-release-builds.patch | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h b/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h index 13b0f6c..7e11aa9 100644 --- a/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h +++ b/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h @@ -377,7 +377,7 @@ public: void setSource(EShSource s) { source = s; } EShSource getSource() const { return source; } #else - void setSource(EShSource s) { assert(s == EShSourceGlsl); } + void setSource(EShSource /*s*/) { /*assert(s == EShSourceGlsl);*/ } EShSource getSource() const { return EShSourceGlsl; } #endif diff --git a/src/glslang/patches/0001-Disable-unused-arg-warning-in-release-builds.patch b/src/glslang/patches/0001-Disable-unused-arg-warning-in-release-builds.patch new file mode 100644 index 0000000..fbd2c83 --- /dev/null +++ b/src/glslang/patches/0001-Disable-unused-arg-warning-in-release-builds.patch @@ -0,0 +1,26 @@ +From 7b5dffd20da0a9a458479298050b17ec917c5a90 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Wed, 23 Oct 2019 12:12:46 +0200 +Subject: [PATCH] Disable unused arg warning in release builds + +Change-Id: Ib68abb9658ae2bb2374071ce3f11e04cffae05c0 +--- + src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h b/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h +index 13b0f6c..7e11aa9 100644 +--- a/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h ++++ b/src/3rdparty/glslang/glslang/MachineIndependent/localintermediate.h +@@ -377,7 +377,7 @@ public: + void setSource(EShSource s) { source = s; } + EShSource getSource() const { return source; } + #else +- void setSource(EShSource s) { assert(s == EShSourceGlsl); } ++ void setSource(EShSource /*s*/) { /*assert(s == EShSourceGlsl);*/ } + EShSource getSource() const { return EShSourceGlsl; } + #endif + +-- +2.9.3.windows.2 + |