From e6383286d9c4bf34ba6253ccaeffb536319ca3a5 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 28 Apr 2021 02:36:19 +1000 Subject: [PATCH] D3D11HostDisplay: Make screenshots/display rendering opaque --- src/frontend-common/display_ps.hlsl | 2 +- src/frontend-common/display_ps.hlsl.h | 49 ++++++++++++++++----------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/frontend-common/display_ps.hlsl b/src/frontend-common/display_ps.hlsl index d20f60ed2..95f12b6c3 100644 --- a/src/frontend-common/display_ps.hlsl +++ b/src/frontend-common/display_ps.hlsl @@ -4,5 +4,5 @@ SamplerState samp0_ss : register(s0); void main(in float2 v_tex0 : TEXCOORD0, out float4 o_col0 : SV_Target) { - o_col0 = samp0.Sample(samp0_ss, v_tex0); + o_col0 = float4(samp0.Sample(samp0_ss, v_tex0).rgb, 1.0); } \ No newline at end of file diff --git a/src/frontend-common/display_ps.hlsl.h b/src/frontend-common/display_ps.hlsl.h index 688c4570f..f2cbf5355 100644 --- a/src/frontend-common/display_ps.hlsl.h +++ b/src/frontend-common/display_ps.hlsl.h @@ -30,22 +30,25 @@ dcl_sampler s0, mode_default dcl_resource_texture2d (float,float,float,float) t0 dcl_input_ps linear v0.xy dcl_output o0.xyzw -sample o0.xyzw, v0.xyxx, t0.xyzw, s0 +dcl_temps 1 +sample r0.xyzw, v0.xyxx, t0.xyzw, s0 +mov o0.xyz, r0.xyzx +mov o0.w, l(1.000000) ret -// Approximately 2 instruction slots used +// Approximately 4 instruction slots used #endif const BYTE static s_display_ps_bytecode[] = { - 68, 88, 66, 67, 140, 134, - 46, 29, 68, 36, 193, 23, - 94, 171, 102, 123, 183, 66, - 19, 177, 1, 0, 0, 0, - 32, 2, 0, 0, 5, 0, + 68, 88, 66, 67, 192, 215, + 150, 96, 210, 93, 209, 128, + 113, 254, 100, 56, 49, 113, + 128, 72, 1, 0, 0, 0, + 80, 2, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 208, 0, 0, 0, 4, 1, 0, 0, 56, 1, 0, 0, - 164, 1, 0, 0, 82, 68, + 212, 1, 0, 0, 82, 68, 69, 70, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, @@ -89,9 +92,9 @@ const BYTE static s_display_ps_bytecode[] = 0, 0, 15, 0, 0, 0, 83, 86, 95, 84, 97, 114, 103, 101, 116, 0, 171, 171, - 83, 72, 68, 82, 100, 0, + 83, 72, 68, 82, 148, 0, 0, 0, 64, 0, 0, 0, - 25, 0, 0, 0, 90, 0, + 37, 0, 0, 0, 90, 0, 0, 3, 0, 96, 16, 0, 0, 0, 0, 0, 88, 24, 0, 4, 0, 112, 16, 0, @@ -100,16 +103,24 @@ const BYTE static s_display_ps_bytecode[] = 50, 16, 16, 0, 0, 0, 0, 0, 101, 0, 0, 3, 242, 32, 16, 0, 0, 0, - 0, 0, 69, 0, 0, 9, - 242, 32, 16, 0, 0, 0, - 0, 0, 70, 16, 16, 0, - 0, 0, 0, 0, 70, 126, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, 16, 0, 0, 0, 0, 0, - 0, 96, 16, 0, 0, 0, - 0, 0, 62, 0, 0, 1, + 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 54, 0, + 0, 5, 114, 32, 16, 0, + 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, + 128, 63, 62, 0, 0, 1, 83, 84, 65, 84, 116, 0, - 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -121,7 +132,7 @@ const BYTE static s_display_ps_bytecode[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,