Linux build warning fix

* Remove complaint about unused function parameter in resolveUniformLocation() * Remove complaint about defined but not used variable in spvIR.h

Linux build warning fix
2baa7742 · LoopDawg · 75e057f9 · 2baa7742 · 2baa7742
Commit 2baa7742 authored Aug 31, 2017 by LoopDawg
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

spvIR.h SPIRV/spvIR.h +8 -0

iomapper.cpp glslang/MachineIndependent/iomapper.cpp +1 -1

No files found.
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -65,6 +65,14 @@ const Id NoResult = 0;
 const Id NoType = 0;

 const Decoration NoPrecision = DecorationMax;
+
+#ifdef __GNUC__
+#   define POTENTIALLY_UNUSED __attribute__((unused))
+#else
+#   define POTENTIALLY_UNUSED
+#endif
+
+POTENTIALLY_UNUSED
 const MemorySemanticsMask MemorySemanticsAllMemory =
                (MemorySemanticsMask)(MemorySemanticsSequentiallyConsistentMask |
                                      MemorySemanticsUniformMemoryMask |

--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -416,7 +416,7 @@ struct TDefaultIoResolverBase : public glslang::TIoMapResolver

        return 0;
    }
-    int resolveUniformLocation(EShLanguage /*stage*/, const char* /*name*/, const glslang::TType& type, bool is_live) override
+    int resolveUniformLocation(EShLanguage /*stage*/, const char* /*name*/, const glslang::TType& type, bool /*is_live*/) override
    {
        // kick out of not doing this
        if (!doAutoLocationMapping)