Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
81cd764b
Commit
81cd764b
authored
Aug 26, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non-functional: Add some missing const, related to signature selection.
parent
1389e3e6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
revision.h
glslang/Include/revision.h
+2
-2
ParseContextBase.cpp
glslang/MachineIndependent/ParseContextBase.cpp
+1
-1
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+2
-2
ParseHelper.h
glslang/MachineIndependent/ParseHelper.h
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+3
-3
No files found.
glslang/Include/revision.h
View file @
81cd764b
...
@@ -2,5 +2,5 @@
...
@@ -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.14
38
"
#define GLSLANG_REVISION "Overload400-PrecQual.14
42
"
#define GLSLANG_DATE "2
5
-Aug-2016"
#define GLSLANG_DATE "2
6
-Aug-2016"
glslang/MachineIndependent/ParseContextBase.cpp
View file @
81cd764b
...
@@ -70,7 +70,7 @@ namespace glslang {
...
@@ -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
,
...
...
glslang/MachineIndependent/ParseHelper.cpp
View file @
81cd764b
...
@@ -4991,7 +4991,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu
...
@@ -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
...
@@ -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
;
...
...
glslang/MachineIndependent/ParseHelper.h
View file @
81cd764b
...
@@ -144,7 +144,7 @@ protected:
...
@@ -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
);
...
...
hlsl/hlslParseHelper.cpp
View file @
81cd764b
...
@@ -3563,7 +3563,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
...
@@ -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
...
@@ -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
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment