Skip to content

G
glslang
Commit 3a21c880 by John Kessenich Committed by GitHub
Options

Merge pull request #1042 from LoopDawg/warning-fix-2

WIP: Linux build warning fix
parents 43f682f6 2baa7742
Showing with 9 additions and 1 deletion
SPIRV/spvIR.h
...@@ -65,6 +65,14 @@ const Id NoResult = 0; ...@@ -65,6 +65,14 @@ const Id NoResult = 0;
const Id NoType = 0; const Id NoType = 0;
const Decoration NoPrecision = DecorationMax; const Decoration NoPrecision = DecorationMax;
#ifdef __GNUC__
# define POTENTIALLY_UNUSED __attribute__((unused))
#else
# define POTENTIALLY_UNUSED
#endif
POTENTIALLY_UNUSED
const MemorySemanticsMask MemorySemanticsAllMemory = const MemorySemanticsMask MemorySemanticsAllMemory =
(MemorySemanticsMask)(MemorySemanticsSequentiallyConsistentMask | (MemorySemanticsMask)(MemorySemanticsSequentiallyConsistentMask |
MemorySemanticsUniformMemoryMask | MemorySemanticsUniformMemoryMask |
......
glslang/MachineIndependent/iomapper.cpp
...@@ -416,7 +416,7 @@ struct TDefaultIoResolverBase : public glslang::TIoMapResolver ...@@ -416,7 +416,7 @@ struct TDefaultIoResolverBase : public glslang::TIoMapResolver
return 0; 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 // kick out of not doing this
if (!doAutoLocationMapping) if (!doAutoLocationMapping)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment