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
ebf55a07
Unverified
Commit
ebf55a07
authored
Jun 15, 2020
by
rdb
Committed by
GitHub
Jun 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Fix incorrect case in name of DX9-style cube sampler type (#2265)
parent
b919bc88
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
hlsl.sample.dx9.frag
Test/hlsl.sample.dx9.frag
+1
-1
hlslParseables.cpp
hlsl/hlslParseables.cpp
+1
-1
hlslScanContext.cpp
hlsl/hlslScanContext.cpp
+1
-1
No files found.
Test/hlsl.sample.dx9.frag
View file @
ebf55a07
...
...
@@ -3,7 +3,7 @@ sampler g_sam : register(t0);
sampler1D
g_sam1D
:
register
(
t1
);
sampler2D
g_sam2D
:
register
(
t2
);
sampler3D
g_sam3D
:
register
(
t3
);
samplerC
ube
g_samCube
:
register
(
t4
);
samplerC
UBE
g_samCube
:
register
(
t4
);
struct
PS_OUTPUT
{
...
...
hlsl/hlslParseables.cpp
View file @
ebf55a07
...
...
@@ -324,7 +324,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
case
1
:
s
+=
"1D"
;
break
;
case
2
:
s
+=
(
isMS
?
"2DMS"
:
"2D"
);
break
;
case
3
:
s
+=
"3D"
;
break
;
case
4
:
s
+=
"Cube"
;
break
;
case
4
:
s
+=
(
type
==
'S'
?
"CUBE"
:
"Cube"
);
break
;
default
:
s
+=
"UNKNOWN_SAMPLER"
;
break
;
}
}
...
...
hlsl/hlslScanContext.cpp
View file @
ebf55a07
...
...
@@ -317,7 +317,7 @@ void HlslScanContext::fillInKeywordMap()
(
*
KeywordMap
)[
"sampler1D"
]
=
EHTokSampler1d
;
(
*
KeywordMap
)[
"sampler2D"
]
=
EHTokSampler2d
;
(
*
KeywordMap
)[
"sampler3D"
]
=
EHTokSampler3d
;
(
*
KeywordMap
)[
"samplerC
ube
"
]
=
EHTokSamplerCube
;
(
*
KeywordMap
)[
"samplerC
UBE
"
]
=
EHTokSamplerCube
;
(
*
KeywordMap
)[
"sampler_state"
]
=
EHTokSamplerState
;
(
*
KeywordMap
)[
"SamplerState"
]
=
EHTokSamplerState
;
(
*
KeywordMap
)[
"SamplerComparisonState"
]
=
EHTokSamplerComparisonState
;
...
...
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