RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2025-02-08 03:46:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1195 from LoopDawg/gcc-bug-workaround

Browse Source 
compile error fix for g++ 5.4.0
This commit is contained in:
John Kessenich 2017-12-20 15:37:22 -07:00 committed by GitHub
commit 3b2dc1a756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -1388,7 +1388,8 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
// Figure out which variants are allowed by what extensions,
// and what arguments must be constant for which situations.
featureString = fnCandidate.getName() + "(...)";
featureString = fnCandidate.getName();
featureString += "(...)";
feature = featureString.c_str();
profileRequires(loc, EEsProfile, 310, nullptr, feature);
int compArg = -1; // track which argument, if any, is the constant component argument
@ -1445,7 +1446,8 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
bias = fnCandidate.getParamCount() > 4;
if (bias) {
featureString = fnCandidate.getName() + "with bias argument";
featureString = fnCandidate.getName();
featureString += "with bias argument";
feature = featureString.c_str();
profileRequires(loc, ~EEsProfile, 450, nullptr, feature);
requireExtensions(loc, 1, &E_GL_AMD_texture_gather_bias_lod, feature);
@ -1468,7 +1470,8 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
bias = fnCandidate.getParamCount() > 5;
if (bias) {
featureString = fnCandidate.getName() + "with bias argument";
featureString = fnCandidate.getName();
featureString += "with bias argument";
feature = featureString.c_str();
profileRequires(loc, ~EEsProfile, 450, nullptr, feature);
requireExtensions(loc, 1, &E_GL_AMD_texture_gather_bias_lod, feature);