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

fix further MSVC 2012 build issues

Browse Source 
MSVC 2012 does not allow initializer lists - replaced with corrresponding CTor calls.
This commit is contained in:
St0fF 2018-04-09 21:08:14 +02:00
parent e735042306
commit a1184ddd48
1 changed files with 3 additions and 3 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()));