Skip to content

G
glslang
Commit bf6efd03 by John Kessenich
Options

SPV: Fix #2293: keep relaxed precision on arg passed to relaxed param

When arguments are copied to make space for a writable formal parameter, and the formal parameter is relaxed precision, make the copy also relaxed precision.
parent 4df10335
Showing with 77 additions and 32 deletions
SPIRV/GlslangToSpv.cpp
...@@ -5336,6 +5336,8 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg ...@@ -5336,6 +5336,8 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
// need space to hold the copy // need space to hold the copy
arg = builder.createVariable(spv::StorageClassFunction, arg = builder.createVariable(spv::StorageClassFunction,
builder.getContainedTypeId(function->getParamType(a)), "param"); builder.getContainedTypeId(function->getParamType(a)), "param");
if (function->isReducedPrecisionParam(a))
builder.setPrecision(arg, spv::DecorationRelaxedPrecision);
if (qualifiers[a] == glslang::EvqIn || qualifiers[a] == glslang::EvqInOut) { if (qualifiers[a] == glslang::EvqIn || qualifiers[a] == glslang::EvqInOut) {
// need to copy the input into output space // need to copy the input into output space
builder.setAccessChain(lValues[lValueCount]); builder.setAccessChain(lValues[lValueCount]);
......
Test/baseResults/spv.forwardFun.frag.out
...@@ -26,6 +26,7 @@ spv.forwardFun.frag ...@@ -26,6 +26,7 @@ spv.forwardFun.frag
Decorate 15(bar) RelaxedPrecision Decorate 15(bar) RelaxedPrecision
Decorate 18(color) RelaxedPrecision Decorate 18(color) RelaxedPrecision
Decorate 20(BaseColor) RelaxedPrecision Decorate 20(BaseColor) RelaxedPrecision
Decorate 21(param) RelaxedPrecision
Decorate 22 RelaxedPrecision Decorate 22 RelaxedPrecision
Decorate 23 RelaxedPrecision Decorate 23 RelaxedPrecision
Decorate 24 RelaxedPrecision Decorate 24 RelaxedPrecision
......
Test/baseResults/spv.noDeadDecorations.vert.out
...@@ -23,6 +23,7 @@ spv.noDeadDecorations.vert ...@@ -23,6 +23,7 @@ spv.noDeadDecorations.vert
MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
Decorate 20(gl_PerVertex) Block Decorate 20(gl_PerVertex) Block
Decorate 26(param) RelaxedPrecision
Decorate 27 RelaxedPrecision Decorate 27 RelaxedPrecision
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
......
Test/baseResults/spv.precisionArgs.frag.out
spv.precisionArgs.frag spv.precisionArgs.frag
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 8000a // Generated by (magic number): 8000a
// Id's are bound by 27 // Id's are bound by 42
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
...@@ -13,42 +13,69 @@ spv.precisionArgs.frag ...@@ -13,42 +13,69 @@ spv.precisionArgs.frag
Name 10 "fooConst(f1;f1;" Name 10 "fooConst(f1;f1;"
Name 8 "f" Name 8 "f"
Name 9 "g" Name 9 "g"
Name 13 "aM" Name 16 "foo(f1;f1;"
Name 15 "bM" Name 14 "f"
Name 17 "arg" Name 15 "g"
Name 20 "aH" Name 18 "aM"
Name 22 "bH" Name 20 "bM"
Name 24 "arg" Name 22 "arg"
Name 25 "aH"
Name 27 "bH"
Name 29 "arg"
Name 32 "param"
Name 34 "param"
Name 37 "param"
Name 39 "param"
Decorate 8(f) RelaxedPrecision Decorate 8(f) RelaxedPrecision
Decorate 13(aM) RelaxedPrecision Decorate 14(f) RelaxedPrecision
Decorate 14 RelaxedPrecision Decorate 18(aM) RelaxedPrecision
Decorate 15(bM) RelaxedPrecision Decorate 19 RelaxedPrecision
Decorate 16 RelaxedPrecision Decorate 20(bM) RelaxedPrecision
Decorate 24(arg) RelaxedPrecision Decorate 21 RelaxedPrecision
Decorate 25 RelaxedPrecision Decorate 29(arg) RelaxedPrecision
Decorate 30 RelaxedPrecision
Decorate 32(param) RelaxedPrecision
Decorate 33 RelaxedPrecision
Decorate 35 RelaxedPrecision
Decorate 37(param) RelaxedPrecision
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
7: TypeFunction 2 6(float) 6(float) 7: TypeFunction 2 6(float) 6(float)
12: TypePointer Function 6(float) 12: TypePointer Function 6(float)
13: TypeFunction 2 12(ptr) 12(ptr)
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
13(aM): 12(ptr) Variable Function 18(aM): 12(ptr) Variable Function
15(bM): 12(ptr) Variable Function 20(bM): 12(ptr) Variable Function
17(arg): 12(ptr) Variable Function 22(arg): 12(ptr) Variable Function
20(aH): 12(ptr) Variable Function 25(aH): 12(ptr) Variable Function
22(bH): 12(ptr) Variable Function 27(bH): 12(ptr) Variable Function
24(arg): 12(ptr) Variable Function 29(arg): 12(ptr) Variable Function
14: 6(float) Load 13(aM) 32(param): 12(ptr) Variable Function
16: 6(float) Load 15(bM) 34(param): 12(ptr) Variable Function
Store 17(arg) 16 37(param): 12(ptr) Variable Function
18: 6(float) Load 17(arg) 39(param): 12(ptr) Variable Function
19: 2 FunctionCall 10(fooConst(f1;f1;) 14 18 19: 6(float) Load 18(aM)
21: 6(float) Load 20(aH) 21: 6(float) Load 20(bM)
23: 6(float) Load 22(bH) Store 22(arg) 21
Store 24(arg) 21 23: 6(float) Load 22(arg)
25: 6(float) Load 24(arg) 24: 2 FunctionCall 10(fooConst(f1;f1;) 19 23
26: 2 FunctionCall 10(fooConst(f1;f1;) 25 23 26: 6(float) Load 25(aH)
28: 6(float) Load 27(bH)
Store 29(arg) 26
30: 6(float) Load 29(arg)
31: 2 FunctionCall 10(fooConst(f1;f1;) 30 28
33: 6(float) Load 18(aM)
Store 32(param) 33
35: 6(float) Load 20(bM)
Store 34(param) 35
36: 2 FunctionCall 16(foo(f1;f1;) 32(param) 34(param)
38: 6(float) Load 25(aH)
Store 37(param) 38
40: 6(float) Load 27(bH)
Store 39(param) 40
41: 2 FunctionCall 16(foo(f1;f1;) 37(param) 39(param)
Return Return
FunctionEnd FunctionEnd
10(fooConst(f1;f1;): 2 Function None 7 10(fooConst(f1;f1;): 2 Function None 7
...@@ -57,3 +84,9 @@ spv.precisionArgs.frag ...@@ -57,3 +84,9 @@ spv.precisionArgs.frag
11: Label 11: Label
Return Return
FunctionEnd FunctionEnd
16(foo(f1;f1;): 2 Function None 13
14(f): 12(ptr) FunctionParameter
15(g): 12(ptr) FunctionParameter
17: Label
Return
FunctionEnd
Test/baseResults/spv.switch.frag.out
...@@ -154,15 +154,21 @@ WARNING: 0:139: 'switch' : last case/default label not followed by statements ...@@ -154,15 +154,21 @@ WARNING: 0:139: 'switch' : last case/default label not followed by statements
Decorate 230 RelaxedPrecision Decorate 230 RelaxedPrecision
Decorate 231 RelaxedPrecision Decorate 231 RelaxedPrecision
Decorate 233(v) RelaxedPrecision Decorate 233(v) RelaxedPrecision
Decorate 234(param) RelaxedPrecision
Decorate 235 RelaxedPrecision Decorate 235 RelaxedPrecision
Decorate 236(param) RelaxedPrecision
Decorate 237 RelaxedPrecision Decorate 237 RelaxedPrecision
Decorate 238(param) RelaxedPrecision
Decorate 239 RelaxedPrecision Decorate 239 RelaxedPrecision
Decorate 240 RelaxedPrecision Decorate 240 RelaxedPrecision
Decorate 243 RelaxedPrecision Decorate 243 RelaxedPrecision
Decorate 244 RelaxedPrecision Decorate 244 RelaxedPrecision
Decorate 245 RelaxedPrecision Decorate 245 RelaxedPrecision
Decorate 246(param) RelaxedPrecision
Decorate 247 RelaxedPrecision Decorate 247 RelaxedPrecision
Decorate 248(param) RelaxedPrecision
Decorate 249 RelaxedPrecision Decorate 249 RelaxedPrecision
Decorate 250(param) RelaxedPrecision
Decorate 251 RelaxedPrecision Decorate 251 RelaxedPrecision
Decorate 252 RelaxedPrecision Decorate 252 RelaxedPrecision
Decorate 254 RelaxedPrecision Decorate 254 RelaxedPrecision
......
Test/spv.precisionArgs.frag
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
precision mediump float; precision mediump float;
void fooConst(const in float f, const in highp float g) void fooConst(const in float f, const in highp float g) { }
{
} void foo(in float f, in highp float g) { }
void main() void main()
{ {
...@@ -12,4 +12,6 @@ void main() ...@@ -12,4 +12,6 @@ void main()
highp float aH, bH; highp float aH, bH;
fooConst(aM, bM); // must copy bM fooConst(aM, bM); // must copy bM
fooConst(aH, bH); // must copy aH fooConst(aH, bH); // must copy aH
foo(aM, bM);
foo(aH, bH);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment