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
84e59203
Commit
84e59203
authored
Jan 02, 2017
by
t.jung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updates overload handling to be more careful when allowing overloads over texture types
Change-Id: I60cf0b0e03da89b0e415125f1a9ffb1de7db71d4
parent
aa6d5629
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
0 deletions
+33
-0
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+33
-0
No files found.
hlsl/hlslParseHelper.cpp
View file @
84e59203
...
@@ -4560,6 +4560,39 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
...
@@ -4560,6 +4560,39 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
// but it is allowed to promote its other arguments.
// but it is allowed to promote its other arguments.
if
(
arg
==
0
)
if
(
arg
==
0
)
return
false
;
return
false
;
break
;
case
EOpMethodSample
:
case
EOpMethodSampleBias
:
case
EOpMethodSampleCmp
:
case
EOpMethodSampleCmpLevelZero
:
case
EOpMethodSampleGrad
:
case
EOpMethodSampleLevel
:
case
EOpMethodLoad
:
case
EOpMethodGetDimensions
:
case
EOpMethodGetSamplePosition
:
case
EOpMethodGather
:
case
EOpMethodCalculateLevelOfDetail
:
case
EOpMethodCalculateLevelOfDetailUnclamped
:
case
EOpMethodGatherRed
:
case
EOpMethodGatherGreen
:
case
EOpMethodGatherBlue
:
case
EOpMethodGatherAlpha
:
case
EOpMethodGatherCmp
:
case
EOpMethodGatherCmpRed
:
case
EOpMethodGatherCmpGreen
:
case
EOpMethodGatherCmpBlue
:
case
EOpMethodGatherCmpAlpha
:
case
EOpMethodAppend
:
case
EOpMethodRestartStrip
:
// those are method calls, the object type can not be changed
// they are equal if the dim and type match (is dim sufficient?)
if
(
arg
==
0
)
return
from
.
getSampler
().
type
==
to
.
getSampler
().
type
&&
from
.
getSampler
().
arrayed
==
to
.
getSampler
().
arrayed
&&
from
.
getSampler
().
shadow
==
to
.
getSampler
().
shadow
&&
from
.
getSampler
().
ms
==
to
.
getSampler
().
ms
&&
from
.
getSampler
().
dim
==
to
.
getSampler
().
dim
;
break
;
default
:
default
:
break
;
break
;
}
}
...
...
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