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
028c5a8d
Commit
028c5a8d
authored
Oct 07, 2017
by
LoopDawg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: nonfunctional: rename setId -> switchId, add comment
Method rename, add comment about its intended use. No test diffs.
parent
bb79abcc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
intermediate.h
glslang/Include/intermediate.h
+4
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+1
-1
No files found.
glslang/Include/intermediate.h
View file @
028c5a8d
...
...
@@ -979,7 +979,6 @@ public:
constSubtree
(
nullptr
)
{
name
=
n
;
}
virtual
int
getId
()
const
{
return
id
;
}
virtual
void
setId
(
int
newId
)
{
id
=
newId
;
}
virtual
const
TString
&
getName
()
const
{
return
name
;
}
virtual
void
traverse
(
TIntermTraverser
*
);
virtual
TIntermSymbol
*
getAsSymbolNode
()
{
return
this
;
}
...
...
@@ -993,6 +992,10 @@ public:
int
getFlattenSubset
()
const
{
return
flattenSubset
;
}
// -1 means full object
#endif
// This is meant for cases where a node has already been constructed, and
// later on, it becomes necessary to switch to a different symbol.
virtual
void
switchId
(
int
newId
)
{
id
=
newId
;
}
protected
:
int
id
;
// the unique id of the symbol this node represents
#ifdef ENABLE_HLSL
...
...
hlsl/hlslParseHelper.cpp
View file @
028c5a8d
...
...
@@ -2994,7 +2994,7 @@ TIntermAggregate* HlslParseContext::handleSamplerTextureCombine(const TSourceLoc
argTex
->
getWritableType
().
getSampler
().
shadow
=
shadowMode
;
samplerType
.
shadow
=
shadowMode
;
texSymbol
->
s
et
Id
(
newId
);
texSymbol
->
s
witch
Id
(
newId
);
}
txcombine
->
setType
(
TType
(
samplerType
,
EvqTemporary
));
...
...
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