From a1184ddd48fc3f136929b343554c4f85a7a496c9 Mon Sep 17 00:00:00 2001
From: St0fF <st0ff.npl@gmail.com>
Date: Mon, 9 Apr 2018 21:08:14 +0200
Subject: [PATCH] fix further MSVC 2012 build issues
MSVC 2012 does not allow initializer lists - replaced with corrresponding CTor calls.
---
SPIRV/GlslangToSpv.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 6a28a1c1c..95b507b13 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -3638,7 +3638,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
if (builder.getImageTypeFormat(builder.getImageType(operands.front())) == spv::ImageFormatUnknown)
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);
// 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)
- };
+ );
if (components != node->getType().getVectorSize())
result[0] = builder.createConstructor(precision, result, convertGlslangToSpvType(node->getType()));
--
GitLab