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

Non-functional: Add some missing const, related to signature selection.

Browse Source
This commit is contained in:
John Kessenich 2016-08-26 14:01:43 -06:00
parent 1389e3e63d
commit 81cd764b5f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1438" #define GLSLANG_REVISION "Overload400-PrecQual.1442"
#define GLSLANG_DATE "25-Aug-2016" #define GLSLANG_DATE "26-Aug-2016"

2
glslang/MachineIndependent/ParseContextBase.cpp
View File

@ -70,7 +70,7 @@ namespace glslang {
// caller's choice for how to report) // caller's choice for how to report)
// //
const TFunction* TParseContextBase::selectFunction( const TFunction* TParseContextBase::selectFunction(
TVector<const TFunction*> candidateList, const TVector<const TFunction*> candidateList,
const TFunction& call, const TFunction& call,
std::function<bool(const TType& from, const TType& to)> convertible, std::function<bool(const TType& from, const TType& to)> convertible,
std::function<bool(const TType& from, const TType& to1, const TType& to2)> better, std::function<bool(const TType& from, const TType& to1, const TType& to2)> better,

4
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -4991,7 +4991,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn); symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
// can 'from' convert to 'to'? // can 'from' convert to 'to'?
auto convertible = [this](const TType& from, const TType& to) { const auto convertible = [this](const TType& from, const TType& to) {
if (from == to) if (from == to)
return true; return true;
if (from.isArray() || to.isArray() || ! from.sameElementShape(to)) if (from.isArray() || to.isArray() || ! from.sameElementShape(to))
@ -5002,7 +5002,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
// Is 'to2' a better conversion than 'to1'? // Is 'to2' a better conversion than 'to1'?
// Ties should not be considered as better. // Ties should not be considered as better.
// Assumes 'convertible' already said true. // Assumes 'convertible' already said true.
auto better = [](const TType& from, const TType& to1, const TType& to2) { const auto better = [](const TType& from, const TType& to1, const TType& to2) {
// 1. exact match // 1. exact match
if (from == to2) if (from == to2)
return from != to1; return from != to1;

2
glslang/MachineIndependent/ParseHelper.h
View File

@ -144,7 +144,7 @@ protected:
std::function<void(int, const char*)> errorCallback; std::function<void(int, const char*)> errorCallback;
// see implementation for detail // see implementation for detail
const TFunction* selectFunction(TVector<const TFunction*>, const TFunction&, const TFunction* selectFunction(const TVector<const TFunction*>, const TFunction&,
std::function<bool(const TType&, const TType&)>, std::function<bool(const TType&, const TType&)>,
std::function<bool(const TType&, const TType&, const TType&)>, std::function<bool(const TType&, const TType&, const TType&)>,
/* output */ bool& tie); /* output */ bool& tie);

6
hlsl/hlslParseHelper.cpp
View File

@ -3563,7 +3563,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn); symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
// can 'from' convert to 'to'? // can 'from' convert to 'to'?
auto convertible = [this](const TType& from, const TType& to) { const auto convertible = [this](const TType& from, const TType& to) {
if (from == to) if (from == to)
return true; return true;
@ -3590,7 +3590,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
// Is 'to2' a better conversion than 'to1'? // Is 'to2' a better conversion than 'to1'?
// Ties should not be considered as better. // Ties should not be considered as better.
// Assumes 'convertible' already said true. // Assumes 'convertible' already said true.
auto better = [](const TType& from, const TType& to1, const TType& to2) { const auto better = [](const TType& from, const TType& to1, const TType& to2) {
// exact match is always better than mismatch // exact match is always better than mismatch
if (from == to2) if (from == to2)
return from != to1; return from != to1;
@ -3617,7 +3617,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
// - 32 vs. 64 bit (or width in general) // - 32 vs. 64 bit (or width in general)
// - bool vs. non bool // - bool vs. non bool
// - signed vs. not signed // - signed vs. not signed
auto linearize = [](const TBasicType& basicType) { const auto linearize = [](const TBasicType& basicType) {
switch (basicType) { switch (basicType) {
case EbtBool: return 1; case EbtBool: return 1;
case EbtInt: return 10; case EbtInt: return 10;