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
e22e3473
Commit
e22e3473
authored
Jan 11, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Fix #1208: accept both int and uint in asuint() and asint().
parent
63400477
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
hlsl.intrinsics.frag.out
Test/baseResults/hlsl.intrinsics.frag.out
+0
-0
hlsl.intrinsics.frag
Test/hlsl.intrinsics.frag
+2
-2
hlslParseables.cpp
hlsl/hlslParseables.cpp
+2
-2
No files found.
Test/baseResults/hlsl.intrinsics.frag.out
View file @
e22e3473
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Test/hlsl.intrinsics.frag
View file @
e22e3473
...
@@ -13,7 +13,7 @@ groupshared uint4 gs_ua4;
...
@@ -13,7 +13,7 @@ groupshared uint4 gs_ua4;
groupshared
uint4
gs_ub4
;
groupshared
uint4
gs_ub4
;
groupshared
uint4
gs_uc4
;
groupshared
uint4
gs_uc4
;
float
PixelShaderFunctionS
(
float
inF0
,
float
inF1
,
float
inF2
,
uint
inU0
,
u
int
inU1
)
float
PixelShaderFunctionS
(
float
inF0
,
float
inF1
,
float
inF2
,
uint
inU0
,
int
inU1
)
{
{
uint
out_u1
;
uint
out_u1
;
...
@@ -23,7 +23,7 @@ float PixelShaderFunctionS(float inF0, float inF1, float inF2, uint inU0, uint i
...
@@ -23,7 +23,7 @@ float PixelShaderFunctionS(float inF0, float inF1, float inF2, uint inU0, uint i
bool
r003
=
any
(
inF0
);
bool
r003
=
any
(
inF0
);
float
r004
=
asin
(
inF0
);
float
r004
=
asin
(
inF0
);
int
r005
=
asint
(
inF0
);
int
r005
=
asint
(
inF0
);
uint
r006
=
asuint
(
in
F0
);
uint
r006
=
asuint
(
in
U1
);
float
r007
=
asfloat
(
inU0
);
float
r007
=
asfloat
(
inU0
);
// asdouble(inU0, inU1); // TODO: enable when HLSL parser used for intrinsics
// asdouble(inU0, inU1); // TODO: enable when HLSL parser used for intrinsics
float
r009
=
atan
(
inF0
);
float
r009
=
atan
(
inF0
);
...
...
hlsl/hlslParseables.cpp
View file @
e22e3473
...
@@ -580,8 +580,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
...
@@ -580,8 +580,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{
"asdouble"
,
"V2"
,
"D"
,
"V2,"
,
"UI,"
,
EShLangAll
,
false
},
{
"asdouble"
,
"V2"
,
"D"
,
"V2,"
,
"UI,"
,
EShLangAll
,
false
},
{
"asfloat"
,
nullptr
,
"F"
,
"SVM"
,
"BFIU"
,
EShLangAll
,
false
},
{
"asfloat"
,
nullptr
,
"F"
,
"SVM"
,
"BFIU"
,
EShLangAll
,
false
},
{
"asin"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
{
"asin"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
{
"asint"
,
nullptr
,
"I"
,
"SVM"
,
"F
U"
,
EShLangAll
,
false
},
{
"asint"
,
nullptr
,
"I"
,
"SVM"
,
"F
IU"
,
EShLangAll
,
false
},
{
"asuint"
,
nullptr
,
"U"
,
"SVM"
,
"F
U"
,
EShLangAll
,
false
},
{
"asuint"
,
nullptr
,
"U"
,
"SVM"
,
"F
IU"
,
EShLangAll
,
false
},
{
"atan"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
{
"atan"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
{
"atan2"
,
nullptr
,
nullptr
,
"SVM,"
,
"F,"
,
EShLangAll
,
false
},
{
"atan2"
,
nullptr
,
nullptr
,
"SVM,"
,
"F,"
,
EShLangAll
,
false
},
{
"ceil"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
{
"ceil"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
,
false
},
...
...
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