moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use a Texture2DArray in HLSL to match the SRVs"

Browse Source 
This reverts commit d389f9a6e9bc0e06dec1b299a330be0640b75652.
This commit is contained in:
Cameron Gutman 2024-06-29 14:07:41 -05:00
parent 93408386ae
commit 1a1ce05959
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/shaders/build_hlsl.bat
View File

@ -1,6 +1,6 @@
fxc /T vs_4_0 /Fo d3d11_vertex.fxc d3d11_vertex.hlsl fxc /T vs_4_0_level_9_3 /Fo d3d11_vertex.fxc d3d11_vertex.hlsl
fxc /T ps_4_0 /Fo d3d11_overlay_pixel.fxc d3d11_overlay_pixel.hlsl fxc /T ps_4_0_level_9_3 /Fo d3d11_overlay_pixel.fxc d3d11_overlay_pixel.hlsl
fxc /T ps_4_0 /Fo d3d11_genyuv_pixel.fxc d3d11_genyuv_pixel.hlsl fxc /T ps_4_0_level_9_3 /Fo d3d11_genyuv_pixel.fxc d3d11_genyuv_pixel.hlsl
fxc /T ps_4_0 /Fo d3d11_bt601lim_pixel.fxc d3d11_bt601lim_pixel.hlsl fxc /T ps_4_0_level_9_3 /Fo d3d11_bt601lim_pixel.fxc d3d11_bt601lim_pixel.hlsl
fxc /T ps_4_0 /Fo d3d11_bt2020lim_pixel.fxc d3d11_bt2020lim_pixel.hlsl fxc /T ps_4_0_level_9_3 /Fo d3d11_bt2020lim_pixel.fxc d3d11_bt2020lim_pixel.hlsl

BIN
app/shaders/d3d11_bt2020lim_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_bt601lim_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_genyuv_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_overlay_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_vertex.fxc
View File

Binary file not shown.

4
app/shaders/d3d11_vertex.hlsl
View File

@ -1,13 +1,13 @@
struct ShaderInput struct ShaderInput
{ {
float2 pos : POSITION; float2 pos : POSITION;
float3 tex : TEXCOORD0; float2 tex : TEXCOORD0;
}; };
struct ShaderOutput struct ShaderOutput
{ {
float4 pos : SV_POSITION; float4 pos : SV_POSITION;
float3 tex : TEXCOORD0; float2 tex : TEXCOORD0;
}; };
ShaderOutput main(ShaderInput input) ShaderOutput main(ShaderInput input)

2
app/shaders/d3d11_video_pixel_end.hlsli
View File

@ -2,7 +2,7 @@ min16float4 main(ShaderInput input) : SV_TARGET
{ {
// Clamp the chrominance texcoords to avoid sampling the row of texels adjacent to the alignment padding // Clamp the chrominance texcoords to avoid sampling the row of texels adjacent to the alignment padding
min16float3 yuv = min16float3(luminancePlane.Sample(theSampler, input.tex), min16float3 yuv = min16float3(luminancePlane.Sample(theSampler, input.tex),
chrominancePlane.Sample(theSampler, min(input.tex, chromaTexMax))); chrominancePlane.Sample(theSampler, min(input.tex, chromaTexMax.rg)));
// Subtract the YUV offset for limited vs full range // Subtract the YUV offset for limited vs full range
yuv -= offsets; yuv -= offsets;

6
app/shaders/d3d11_video_pixel_start.hlsli
View File

@ -1,11 +1,11 @@
Texture2DArray<min16float> luminancePlane : register(t0); Texture2D<min16float> luminancePlane : register(t0);
Texture2DArray<min16float2> chrominancePlane : register(t1); Texture2D<min16float2> chrominancePlane : register(t1);
SamplerState theSampler : register(s0); SamplerState theSampler : register(s0);
struct ShaderInput struct ShaderInput
{ {
float4 pos : SV_POSITION; float4 pos : SV_POSITION;
float3 tex : TEXCOORD0; float2 tex : TEXCOORD0;
}; };
cbuffer ChromaLimitBuf : register(b0) cbuffer ChromaLimitBuf : register(b0)

18
app/streaming/video/ffmpeg-renderers/d3d11va.cpp
View File

@ -18,7 +18,7 @@
typedef struct _VERTEX typedef struct _VERTEX
{ {
float x, y; float x, y;
float tu, tv, tw; float tu, tv;
} VERTEX, *PVERTEX; } VERTEX, *PVERTEX;
#define CSC_MATRIX_RAW_ELEMENT_COUNT 9 #define CSC_MATRIX_RAW_ELEMENT_COUNT 9
@ -890,10 +890,10 @@ void D3D11VARenderer::notifyOverlayUpdated(Overlay::OverlayType type)
VERTEX verts[] = VERTEX verts[] =
{ {
{renderRect.x, renderRect.y, 0, 1, 0}, {renderRect.x, renderRect.y, 0, 1},
{renderRect.x, renderRect.y+renderRect.h, 0, 0, 0}, {renderRect.x, renderRect.y+renderRect.h, 0, 0},
{renderRect.x+renderRect.w, renderRect.y, 1, 1, 0}, {renderRect.x+renderRect.w, renderRect.y, 1, 1},
{renderRect.x+renderRect.w, renderRect.y+renderRect.h, 1, 0, 0}, {renderRect.x+renderRect.w, renderRect.y+renderRect.h, 1, 0},
}; };
D3D11_BUFFER_DESC vbDesc = {}; D3D11_BUFFER_DESC vbDesc = {};
@ -1305,10 +1305,10 @@ bool D3D11VARenderer::setupRenderingResources()
VERTEX verts[] = VERTEX verts[] =
{ {
{renderRect.x, renderRect.y, 0, vMax, 0}, {renderRect.x, renderRect.y, 0, vMax},
{renderRect.x, renderRect.y+renderRect.h, 0, 0, 0}, {renderRect.x, renderRect.y+renderRect.h, 0, 0},
{renderRect.x+renderRect.w, renderRect.y, uMax, vMax, 0}, {renderRect.x+renderRect.w, renderRect.y, uMax, vMax},
{renderRect.x+renderRect.w, renderRect.y+renderRect.h, uMax, 0, 0}, {renderRect.x+renderRect.w, renderRect.y+renderRect.h, uMax, 0},
}; };
D3D11_BUFFER_DESC vbDesc = {}; D3D11_BUFFER_DESC vbDesc = {};