From c074f2bc249b70295fbeee4ceffc0f9811dfd618 Mon Sep 17 00:00:00 2001
From: LoopDawg <sk_opengl@khasekhemwy.net>
Date: Tue, 19 Dec 2017 17:53:46 -0700
Subject: [PATCH] g++ 5.4.0 suspected defect workaround
Fix compilation error under g++ 5.4.0.
---
glslang/MachineIndependent/ParseHelper.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index d662be155..9254aa62b 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -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);
--
GitLab