moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 02:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate D3D11 constant buffers now that all shaders need a CSC constant buffer

Browse Source
This commit is contained in:
Cameron Gutman
2025-11-24 18:47:14 -06:00
parent 245cd7f1a8
commit 4164a222ae
7 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/shaders/d3d11_ayuv_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_y410_pixel.fxc
View File

Binary file not shown.

BIN
app/shaders/d3d11_yuv420_pixel.fxc
View File

Binary file not shown.

8
app/shaders/d3d11_yuv420_pixel.hlsl
View File

@@ -8,16 +8,12 @@ struct ShaderInput
float2 tex : TEXCOORD0;
};
cbuffer ChromaLimitBuf : register(b0)
{
min16float3 chromaTexMax;
};
cbuffer CSC_CONST_BUF : register(b1)
cbuffer CSC_CONST_BUF : register(b0)
{
min16float3x3 cscMatrix;
min16float3 offsets;
min16float2 chromaOffset;
min16float2 chromaTexMax;
};
min16float4 main(ShaderInput input) : SV_TARGET

3
app/shaders/d3d11_yuv444_pixel_end.hlsli
View File

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

8
app/shaders/d3d11_yuv444_pixel_start.hlsli
View File

@@ -7,14 +7,10 @@ struct ShaderInput
float2 tex : TEXCOORD0;
};
cbuffer ChromaLimitBuf : register(b0)
{
min16float3 chromaTexMax;
};
cbuffer CSC_CONST_BUF : register(b1)
cbuffer CSC_CONST_BUF : register(b0)
{
min16float3x3 cscMatrix;
min16float3 offsets;
min16float2 chromaOffset; // Unused for 4:4:4
min16float2 chromaTexMax; // Unused for 4:4:4
};

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

@@ -43,8 +43,8 @@ typedef struct _CSC_CONST_BUF
// Chroma offset values
float chromaOffset[2];
// Padding to final 16-byte boundary
float padding2[2];
// Max UV coordinates to avoid sampling alignment padding
float chromaUVMax[2];
} CSC_CONST_BUF, *PCSC_CONST_BUF;
static_assert(sizeof(CSC_CONST_BUF) % 16 == 0, "Constant buffer sizes must be a multiple of 16");
@@ -740,13 +740,19 @@ void D3D11VARenderer::bindColorConversion(AVFrame* frame)
constBuf.chromaOffset[0] = chromaOffset[0] / m_TextureWidth;
constBuf.chromaOffset[1] = chromaOffset[1] / m_TextureHeight;
// Limit chroma texcoords to avoid sampling from alignment texels
constBuf.chromaUVMax[0] = m_DecoderParams.width != (int)m_TextureWidth ?
((float)(m_DecoderParams.width - 1) / m_TextureWidth) : 1.0f;
constBuf.chromaUVMax[1] = m_DecoderParams.height != (int)m_TextureHeight ?
((float)(m_DecoderParams.height - 1) / m_TextureHeight) : 1.0f;
D3D11_SUBRESOURCE_DATA constData = {};
constData.pSysMem = &constBuf;
ComPtr<ID3D11Buffer> constantBuffer;
HRESULT hr = m_Device->CreateBuffer(&constDesc, &constData, &constantBuffer);
if (SUCCEEDED(hr)) {
m_DeviceContext->PSSetConstantBuffers(1, 1, constantBuffer.GetAddressOf());
m_DeviceContext->PSSetConstantBuffers(0, 1, constantBuffer.GetAddressOf());
}
else {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -1371,35 +1377,6 @@ bool D3D11VARenderer::setupRenderingResources()
}
}
// Create our fixed constant buffer to limit chroma texcoords and avoid sampling from alignment texels.
{
D3D11_BUFFER_DESC constDesc = {};
constDesc.ByteWidth = sizeof(CSC_CONST_BUF);
constDesc.Usage = D3D11_USAGE_IMMUTABLE;
constDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
constDesc.CPUAccessFlags = 0;
constDesc.MiscFlags = 0;
float chromaUVMax[3] = {};
chromaUVMax[0] = m_DecoderParams.width != (int)m_TextureWidth ? ((float)(m_DecoderParams.width - 1) / m_TextureWidth) : 1.0f;
chromaUVMax[1] = m_DecoderParams.height != (int)m_TextureHeight ? ((float)(m_DecoderParams.height - 1) / m_TextureHeight) : 1.0f;
D3D11_SUBRESOURCE_DATA constData = {};
constData.pSysMem = chromaUVMax;
ComPtr<ID3D11Buffer> constantBuffer;
HRESULT hr = m_Device->CreateBuffer(&constDesc, &constData, &constantBuffer);
if (SUCCEEDED(hr)) {
m_DeviceContext->PSSetConstantBuffers(0, 1, constantBuffer.GetAddressOf());
}
else {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"ID3D11Device::CreateBuffer() failed: %x",
hr);
return false;
}
}
// Create our blend state
{
D3D11_BLEND_DESC blendDesc = {};