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
cf57c044
Commit
cf57c044
authored
Jul 28, 2016
by
steve-lunarg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: add missing vec,vec,scalar form of lerp(), + test
parent
414f7354
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
hlsl.intrinsics.frag.out
Test/baseResults/hlsl.intrinsics.frag.out
+0
-0
hlsl.intrinsics.frag
Test/hlsl.intrinsics.frag
+1
-0
hlslParseables.cpp
hlsl/hlslParseables.cpp
+2
-1
No files found.
Test/baseResults/hlsl.intrinsics.frag.out
View file @
cf57c044
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Test/hlsl.intrinsics.frag
View file @
cf57c044
...
...
@@ -223,6 +223,7 @@ float3 PixelShaderFunction3(float3 inF0, float3 inF1, float3 inF2, uint3 inU0, u
bool3
r041
=
isnan
(
inF0
);
float3
r042
=
ldexp
(
inF0
,
inF1
);
float3
r039a
=
lerp
(
inF0
,
inF1
,
inF2
);
float3
r039b
=
lerp
(
inF0
,
inF1
,
0
.
3
);
// test vec,vec,scalar lerp
float
r043
=
length
(
inF0
);
float3
r044
=
log
(
inF0
);
float3
r045
=
log10
(
inF0
);
...
...
hlsl/hlslParseables.cpp
View file @
cf57c044
...
...
@@ -531,7 +531,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{
"isnan"
,
nullptr
,
"B"
,
"SVM"
,
"F"
,
EShLangAll
},
{
"ldexp"
,
nullptr
,
nullptr
,
"SVM,"
,
"F,"
,
EShLangAll
},
{
"length"
,
"S"
,
"F"
,
"V"
,
"F"
,
EShLangAll
},
{
"lerp"
,
nullptr
,
nullptr
,
"SVM,,"
,
"F,,"
,
EShLangAll
},
{
"lerp"
,
nullptr
,
nullptr
,
"VM,,"
,
"F,,"
,
EShLangAll
},
{
"lerp"
,
nullptr
,
nullptr
,
"SVM,,S"
,
"F,,"
,
EShLangAll
},
{
"lit"
,
"V4"
,
"F"
,
"S,,"
,
"F,,"
,
EShLangAll
},
{
"log"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
},
{
"log10"
,
nullptr
,
nullptr
,
"SVM"
,
"F"
,
EShLangAll
},
...
...
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