Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glslang
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
deqp-deps
glslang
Commits
cf57c044
Commit
cf57c044
authored
8 years ago
by
steve-lunarg
Browse files
Options
Downloads
Patches
Plain Diff
HLSL: add missing vec,vec,scalar form of lerp(), + test
parent
414f7354
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Test/baseResults/hlsl.intrinsics.frag.out
+4551
-4527
4551 additions, 4527 deletions
Test/baseResults/hlsl.intrinsics.frag.out
Test/hlsl.intrinsics.frag
+1
-0
1 addition, 0 deletions
Test/hlsl.intrinsics.frag
hlsl/hlslParseables.cpp
+2
-1
2 additions, 1 deletion
hlsl/hlslParseables.cpp
with
4554 additions
and
4528 deletions
Test/baseResults/hlsl.intrinsics.frag.out
+
4551
−
4527
View file @
cf57c044
This diff is collapsed.
Click to expand it.
Test/hlsl.intrinsics.frag
+
1
−
0
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
);
...
...
This diff is collapsed.
Click to expand it.
hlsl/hlslParseables.cpp
+
2
−
1
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
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment