-
Notifications
You must be signed in to change notification settings - Fork 25
Add Graphics tests for ddx/y_fine #510
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| #--- vertex.hlsl | ||
| struct PSInput | ||
| { | ||
| float4 position : SV_POSITION; | ||
| }; | ||
|
|
||
| PSInput main(float4 position : POSITION) | ||
| { | ||
| PSInput result; | ||
|
|
||
| result.position = position; | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
|
|
||
| #--- pixel.hlsl | ||
|
|
||
| // Offset into the image of our circle | ||
| #define offset 128.0 | ||
| // Radius of our circle | ||
| #define radius 32.0 | ||
| // Blur intensity | ||
| #define intensity 5.0 | ||
|
|
||
| struct PSInput | ||
| { | ||
| float4 position : SV_POSITION; | ||
| }; | ||
|
|
||
| float4 main(PSInput input) : SV_TARGET | ||
| { | ||
| float4 c1 = float4(1.0, 1.0, 1.0, 1.0); | ||
| float4 c2 = float4(0.0, 0.0, 0.0, 1.0); | ||
|
|
||
| float2 coord = input.position.xy - offset; | ||
|
|
||
| float dist = length(coord) - radius; | ||
| float ddx = abs(ddx_fine(dist)); | ||
| float effect = clamp(dist / ddx / intensity, 0.0, 1.0); | ||
|
|
||
| float result = lerp(c1, c2, effect); | ||
|
|
||
| return float4(result, result, result, 1.0); | ||
| } | ||
| #--- pipeline.yaml | ||
| --- | ||
| Shaders: | ||
| - Stage: Vertex | ||
| Entry: main | ||
| - Stage: Pixel | ||
| Entry: main | ||
| Buffers: | ||
| - Name: VertexData | ||
| Format: Float32 | ||
| Stride: 12 # 16 bytes per vertex | ||
| Data: [ -1.0, -1.0, 0.0, | ||
| -1.0, 1.0, 0.0, | ||
| 1.0, 1.0, 0.0, | ||
| 1.0, 1.0, 0.0, | ||
| 1.0, -1.0, 0.0, | ||
| -1.0, -1.0, 0.0 ] | ||
| - Name: Output | ||
| Format: Float32 | ||
| Channels: 4 | ||
| FillSize: 1048576 # 256x256 @ 16 bytes per pixel | ||
| OutputProps: | ||
| Height: 256 | ||
| Width: 256 | ||
| Depth: 16 | ||
| Bindings: | ||
| VertexBuffer: VertexData | ||
| VertexAttributes: | ||
| - Format: Float32 | ||
| Channels: 3 | ||
| Offset: 0 | ||
| Name: POSITION | ||
| RenderTarget: Output | ||
| DescriptorSets: [] | ||
| ... | ||
| #--- rules.yaml | ||
| --- | ||
| - Type: PixelPercent | ||
| Val: 0.2 # No more than 0.2% of pixels may be visibly different. | ||
| ... | ||
| #--- end | ||
|
|
||
| # UNSUPPORTED: Clang | ||
| # REQUIRES: goldenimage | ||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -T vs_6_0 -Fo %t-vertex.o %t/vertex.hlsl | ||
| # RUN: %dxc_target -T ps_6_0 -Fo %t-pixel.o %t/pixel.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t-vertex.o %t-pixel.o -r Output -o %t/Output.png | ||
| # RUN: imgdiff %t/Output.png %goldenimage_dir/hlsl/Graphics/DdxFine.png -rules %t/rules.yaml | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see an uploaded image in this PR. How are you testing this?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The graphics test images are in a different repo. The PR for them is here llvm/offload-golden-images#5 |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| #--- vertex.hlsl | ||
| struct PSInput | ||
| { | ||
| float4 position : SV_POSITION; | ||
| }; | ||
|
|
||
| PSInput main(float4 position : POSITION) | ||
| { | ||
| PSInput result; | ||
|
|
||
| result.position = position; | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
|
|
||
| #--- pixel.hlsl | ||
|
|
||
| // Offset into the image of our circle | ||
| #define offset 128.0 | ||
| // Radius of our circle | ||
| #define radius 32.0 | ||
| // Blur intensity | ||
| #define intensity 5.0 | ||
|
|
||
| struct PSInput | ||
| { | ||
| float4 position : SV_POSITION; | ||
| }; | ||
|
|
||
| float4 main(PSInput input) : SV_TARGET | ||
| { | ||
| float4 c1 = float4(1.0, 1.0, 1.0, 1.0); | ||
| float4 c2 = float4(0.0, 0.0, 0.0, 1.0); | ||
|
|
||
| float2 coord = input.position.xy - offset; | ||
|
|
||
| float dist = length(coord) - radius; | ||
| float ddx = abs(ddy_fine(dist)); | ||
| float effect = clamp(dist / ddx / intensity, 0.0, 1.0); | ||
|
|
||
| float result = lerp(c1, c2, effect); | ||
|
|
||
| return float4(result, result, result, 1.0); | ||
| } | ||
| #--- pipeline.yaml | ||
| --- | ||
| Shaders: | ||
| - Stage: Vertex | ||
| Entry: main | ||
| - Stage: Pixel | ||
| Entry: main | ||
| Buffers: | ||
| - Name: VertexData | ||
| Format: Float32 | ||
| Stride: 12 # 16 bytes per vertex | ||
| Data: [ -1.0, -1.0, 0.0, | ||
| -1.0, 1.0, 0.0, | ||
| 1.0, 1.0, 0.0, | ||
| 1.0, 1.0, 0.0, | ||
| 1.0, -1.0, 0.0, | ||
| -1.0, -1.0, 0.0 ] | ||
| - Name: Output | ||
| Format: Float32 | ||
| Channels: 4 | ||
| FillSize: 1048576 # 256x256 @ 16 bytes per pixel | ||
| OutputProps: | ||
| Height: 256 | ||
| Width: 256 | ||
| Depth: 16 | ||
| Bindings: | ||
| VertexBuffer: VertexData | ||
| VertexAttributes: | ||
| - Format: Float32 | ||
| Channels: 3 | ||
| Offset: 0 | ||
| Name: POSITION | ||
| RenderTarget: Output | ||
| DescriptorSets: [] | ||
| ... | ||
| #--- rules.yaml | ||
| --- | ||
| - Type: PixelPercent | ||
| Val: 0.2 # No more than 0.2% of pixels may be visibly different. | ||
| ... | ||
| #--- end | ||
|
|
||
| # UNSUPPORTED: Clang | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Didn't you merge the clang changes? |
||
| # REQUIRES: goldenimage | ||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -T vs_6_0 -Fo %t-vertex.o %t/vertex.hlsl | ||
| # RUN: %dxc_target -T ps_6_0 -Fo %t-pixel.o %t/pixel.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t-vertex.o %t-pixel.o -r Output -o %t/Output.png | ||
| # RUN: imgdiff %t/Output.png %goldenimage_dir/hlsl/Graphics/DdyFine.png -rules %t/rules.yaml | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same question here. |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't you merge the clang changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ddx/y_coarse was merged, but _fine is waiting for review.
Regardless, all the graphics tests current fail on clang, including the original SimpleTriangle.test, because of other issues.
The output from clang-d3d12-graphics for all tests is
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting can you file an issue and I'll triage it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did some more testing and created #540 (comment).
I'm happy to look into the failure if you'd like
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since it's only failing with DirectX + Clang, you should do this instead: