BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bring up to date with VS 10 express.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@19945 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2012-12-12 21:21:23 +00:00
parent a0af473a8b
commit 200b2734d7
15 changed files with 96 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

9
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -203,12 +203,13 @@ void TParseContext::recover()
void C_DECL TParseContext::error(TSourceLoc nLine, const char *szReason, const char *szToken,
const char *szExtraInfoFormat, ...)
{
char szExtraInfo[400];
const int maxSize = 400;
char szExtraInfo[maxSize];
va_list marker;
va_start(marker, szExtraInfoFormat);
_vsnprintf(szExtraInfo, sizeof(szExtraInfo), szExtraInfoFormat, marker);
_vsnprintf_s(szExtraInfo, maxSize, sizeof(szExtraInfo), szExtraInfoFormat, marker);
/* VC++ format: file(linenum) : error #: 'token' : extrainfo */
infoSink.info.prefix(EPrefixError);
@ -1126,8 +1127,8 @@ TIntermTyped* TParseContext::addConstructor(TIntermNode* node, const TType* type
newNode = constructBuiltIn(type, op, *p, node->getLine(), true);
if (newNode) {
sequenceVector.erase(p);
sequenceVector.insert(p, newNode);
p = sequenceVector.erase(p);
p = sequenceVector.insert(p, newNode);
}
}