mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1341 from St0fF-NPL-ToM/master

Browse Source 
fix VS2012 compile issues
This commit is contained in:
John Kessenich 2018-04-10 14:16:39 -06:00 committed by GitHub
commit c3a370db1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPIRV/GlslangToSpv.cpp
View File

@ -3638,7 +3638,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
if (builder.getImageTypeFormat(builder.getImageType(operands.front())) == spv::ImageFormatUnknown) if (builder.getImageTypeFormat(builder.getImageType(operands.front())) == spv::ImageFormatUnknown)
builder.addCapability(spv::CapabilityStorageImageReadWithoutFormat); builder.addCapability(spv::CapabilityStorageImageReadWithoutFormat);
std::vector<spv::Id> result = { builder.createOp(spv::OpImageRead, resultType(), operands) }; std::vector<spv::Id> result( 1, builder.createOp(spv::OpImageRead, resultType(), operands) );
builder.setPrecision(result[0], precision); builder.setPrecision(result[0], precision);
// If needed, add a conversion constructor to the proper size. // If needed, add a conversion constructor to the proper size.
@ -3926,9 +3926,9 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
} }
} }
std::vector<spv::Id> result = { std::vector<spv::Id> result( 1,
builder.createTextureCall(precision, resultType(), sparse, cracked.fetch, cracked.proj, cracked.gather, noImplicitLod, params) builder.createTextureCall(precision, resultType(), sparse, cracked.fetch, cracked.proj, cracked.gather, noImplicitLod, params)
}; );
if (components != node->getType().getVectorSize()) if (components != node->getType().getVectorSize())
result[0] = builder.createConstructor(precision, result, convertGlslangToSpvType(node->getType())); result[0] = builder.createConstructor(precision, result, convertGlslangToSpvType(node->getType()));

25
glslang/Include/Common.h
View File

@ -67,18 +67,19 @@ std::string to_string(const T& val) {
#endif #endif
#if defined(_MSC_VER) && _MSC_VER < 1800 #if defined(_MSC_VER) && _MSC_VER < 1800
inline long long int strtoll (const char* str, char** endptr, int base) #include <stdlib.h>
{ inline long long int strtoll (const char* str, char** endptr, int base)
return _strtoi64(str, endptr, base); {
} return _strtoi64(str, endptr, base);
inline unsigned long long int strtoull (const char* str, char** endptr, int base) }
{ inline unsigned long long int strtoull (const char* str, char** endptr, int base)
return _strtoui64(str, endptr, base); {
} return _strtoui64(str, endptr, base);
inline long long int atoll (const char* str) }
{ inline long long int atoll (const char* str)
return strtoll(str, NULL, 10); {
} return strtoll(str, NULL, 10);
}
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)

1
glslang/MachineIndependent/Intermediate.cpp
View File

@ -47,6 +47,7 @@
#include <cfloat> #include <cfloat>
#include <utility> #include <utility>
#include <tuple>
namespace glslang { namespace glslang {