mirror of
https://github.com/RPCS3/glslang.git
synced 2024-12-04 09:24:04 +00:00
Non-functional: Add some missing const, related to signature selection.
This commit is contained in:
parent
1389e3e63d
commit
81cd764b5f
@ -2,5 +2,5 @@
|
||||
// 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).
|
||||
|
||||
#define GLSLANG_REVISION "Overload400-PrecQual.1438"
|
||||
#define GLSLANG_DATE "25-Aug-2016"
|
||||
#define GLSLANG_REVISION "Overload400-PrecQual.1442"
|
||||
#define GLSLANG_DATE "26-Aug-2016"
|
||||
|
@ -70,7 +70,7 @@ namespace glslang {
|
||||
// caller's choice for how to report)
|
||||
//
|
||||
const TFunction* TParseContextBase::selectFunction(
|
||||
TVector<const TFunction*> candidateList,
|
||||
const TVector<const TFunction*> candidateList,
|
||||
const TFunction& call,
|
||||
std::function<bool(const TType& from, const TType& to)> convertible,
|
||||
std::function<bool(const TType& from, const TType& to1, const TType& to2)> better,
|
||||
|
@ -4991,7 +4991,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
|
||||
symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
|
||||
|
||||
// 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)
|
||||
return true;
|
||||
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'?
|
||||
// Ties should not be considered as better.
|
||||
// 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
|
||||
if (from == to2)
|
||||
return from != to1;
|
||||
|
@ -144,7 +144,7 @@ protected:
|
||||
std::function<void(int, const char*)> errorCallback;
|
||||
|
||||
// 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&, const TType&)>,
|
||||
/* output */ bool& tie);
|
||||
|
@ -3563,7 +3563,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
|
||||
symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
|
||||
|
||||
// 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)
|
||||
return true;
|
||||
|
||||
@ -3590,7 +3590,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
|
||||
// Is 'to2' a better conversion than 'to1'?
|
||||
// Ties should not be considered as better.
|
||||
// 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
|
||||
if (from == to2)
|
||||
return from != to1;
|
||||
@ -3617,7 +3617,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
|
||||
// - 32 vs. 64 bit (or width in general)
|
||||
// - bool vs. non bool
|
||||
// - signed vs. not signed
|
||||
auto linearize = [](const TBasicType& basicType) {
|
||||
const auto linearize = [](const TBasicType& basicType) {
|
||||
switch (basicType) {
|
||||
case EbtBool: return 1;
|
||||
case EbtInt: return 10;
|
||||
|
Loading…
Reference in New Issue
Block a user