mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-11-23 11:13:19 +01:00
d3d12: Move util shader creation in another file
This commit is contained in:
vlj
Vincent Lejeune
parent
2cd035d530
commit
428d66598d
@ -137,224 +137,6 @@ void D3D12GSRender::ResourceStorage::Release()
|
||||
m_frameFinishedFence->Release();
|
||||
}
|
||||
|
||||
// 32 bits float to U8 unorm CS
|
||||
#define STRINGIFY(x) #x
|
||||
|
||||
/**
|
||||
* returns bytecode and root signature of a Compute Shader converting texture from
|
||||
* one format to another
|
||||
*/
|
||||
static
|
||||
std::pair<ID3DBlob *, ID3DBlob *> compileF32toU8CS()
|
||||
{
|
||||
const char *shaderCode = STRINGIFY(
|
||||
Texture2D<float> InputTexture : register(t0); \n
|
||||
RWTexture2D<float> OutputTexture : register(u0);\n
|
||||
|
||||
[numthreads(8, 8, 1)]\n
|
||||
void main(uint3 Id : SV_DispatchThreadID)\n
|
||||
{ \n
|
||||
OutputTexture[Id.xy] = InputTexture.Load(uint3(Id.xy, 0));\n
|
||||
}
|
||||
);
|
||||
|
||||
ID3DBlob *bytecode;
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> errorBlob;
|
||||
HRESULT hr = D3DCompile(shaderCode, strlen(shaderCode), "test", nullptr, nullptr, "main", "cs_5_0", 0, 0, &bytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
D3D12_DESCRIPTOR_RANGE descriptorRange[2] = {};
|
||||
// Textures
|
||||
descriptorRange[0].BaseShaderRegister = 0;
|
||||
descriptorRange[0].NumDescriptors = 1;
|
||||
descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
|
||||
descriptorRange[1].BaseShaderRegister = 0;
|
||||
descriptorRange[1].NumDescriptors = 1;
|
||||
descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
|
||||
descriptorRange[1].OffsetInDescriptorsFromTableStart = 1;
|
||||
D3D12_ROOT_PARAMETER RP[2] = {};
|
||||
RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[0].DescriptorTable.pDescriptorRanges = &descriptorRange[0];
|
||||
RP[0].DescriptorTable.NumDescriptorRanges = 2;
|
||||
|
||||
D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc = {};
|
||||
rootSignatureDesc.NumParameters = 1;
|
||||
rootSignatureDesc.pParameters = RP;
|
||||
|
||||
ID3DBlob *rootSignatureBlob;
|
||||
|
||||
hr = wrapD3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &rootSignatureBlob, &errorBlob);
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
return std::make_pair(bytecode, rootSignatureBlob);
|
||||
}
|
||||
|
||||
void D3D12GSRender::Shader::Init(ID3D12Device *device)
|
||||
{
|
||||
const char *fsCode = STRINGIFY(
|
||||
Texture2D InputTexture : register(t0); \n
|
||||
sampler bilinearSampler : register(s0); \n
|
||||
|
||||
struct PixelInput \n
|
||||
{ \n
|
||||
float4 Pos : SV_POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
float4 main(PixelInput In) : SV_TARGET \n
|
||||
{ \n
|
||||
return InputTexture.Sample(bilinearSampler, In.TexCoords); \n
|
||||
}
|
||||
);
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> fsBytecode;
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> errorBlob;
|
||||
HRESULT hr = D3DCompile(fsCode, strlen(fsCode), "test", nullptr, nullptr, "main", "ps_5_0", 0, 0, &fsBytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
const char *vsCode = STRINGIFY(
|
||||
struct VertexInput \n
|
||||
{ \n
|
||||
float2 Pos : POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
struct PixelInput \n
|
||||
{ \n
|
||||
float4 Pos : SV_POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
PixelInput main(VertexInput In) \n
|
||||
{ \n
|
||||
PixelInput Out; \n
|
||||
Out.Pos = float4(In.Pos, 0., 1.); \n
|
||||
Out.TexCoords = In.TexCoords; \n
|
||||
return Out; \n
|
||||
}
|
||||
);
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> vsBytecode;
|
||||
hr = D3DCompile(vsCode, strlen(vsCode), "test", nullptr, nullptr, "main", "vs_5_0", 0, 0, &vsBytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
D3D12_GRAPHICS_PIPELINE_STATE_DESC psoDesc = {};
|
||||
psoDesc.PS.BytecodeLength = fsBytecode->GetBufferSize();
|
||||
psoDesc.PS.pShaderBytecode = fsBytecode->GetBufferPointer();
|
||||
psoDesc.VS.BytecodeLength = vsBytecode->GetBufferSize();
|
||||
psoDesc.VS.pShaderBytecode = vsBytecode->GetBufferPointer();
|
||||
psoDesc.NumRenderTargets = 1;
|
||||
psoDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
|
||||
psoDesc.SampleDesc.Count = 1;
|
||||
psoDesc.SampleMask = UINT_MAX;
|
||||
|
||||
D3D12_INPUT_ELEMENT_DESC IADesc[2] = {};
|
||||
IADesc[0].SemanticName = "POSITION";
|
||||
IADesc[0].Format = DXGI_FORMAT_R32G32_FLOAT;
|
||||
IADesc[1].SemanticName = "TEXCOORDS";
|
||||
IADesc[1].Format = DXGI_FORMAT_R32G32_FLOAT;
|
||||
IADesc[1].AlignedByteOffset = 2 * sizeof(float);
|
||||
|
||||
psoDesc.InputLayout.NumElements = 2;
|
||||
psoDesc.InputLayout.pInputElementDescs = IADesc;
|
||||
|
||||
psoDesc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
|
||||
psoDesc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID;
|
||||
|
||||
D3D12_DESCRIPTOR_RANGE descriptorRange[2] = {};
|
||||
// Textures
|
||||
descriptorRange[0].BaseShaderRegister = 0;
|
||||
descriptorRange[0].NumDescriptors = 1;
|
||||
descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
|
||||
descriptorRange[1].BaseShaderRegister = 0;
|
||||
descriptorRange[1].NumDescriptors = 1;
|
||||
descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
|
||||
D3D12_ROOT_PARAMETER RP[2] = {};
|
||||
RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[0].DescriptorTable.pDescriptorRanges = &descriptorRange[0];
|
||||
RP[0].DescriptorTable.NumDescriptorRanges = 1;
|
||||
RP[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[1].DescriptorTable.pDescriptorRanges = &descriptorRange[1];
|
||||
RP[1].DescriptorTable.NumDescriptorRanges = 1;
|
||||
|
||||
D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc = {};
|
||||
rootSignatureDesc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
|
||||
rootSignatureDesc.NumParameters = 2;
|
||||
rootSignatureDesc.pParameters = RP;
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> rootSignatureBlob;
|
||||
|
||||
hr = wrapD3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &rootSignatureBlob, &errorBlob);
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
hr = device->CreateRootSignature(0, rootSignatureBlob->GetBufferPointer(), rootSignatureBlob->GetBufferSize(), IID_PPV_ARGS(&m_rootSignature));
|
||||
|
||||
psoDesc.pRootSignature = m_rootSignature;
|
||||
psoDesc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
|
||||
psoDesc.BlendState.RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL;
|
||||
|
||||
check(device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&m_PSO)));
|
||||
|
||||
|
||||
float quadVertex[16] = {
|
||||
-1., -1., 0., 1.,
|
||||
-1., 1., 0., 0.,
|
||||
1., -1., 1., 1.,
|
||||
1., 1., 1., 0.,
|
||||
};
|
||||
|
||||
D3D12_HEAP_PROPERTIES heapProp = {};
|
||||
heapProp.Type = D3D12_HEAP_TYPE_UPLOAD;
|
||||
check(
|
||||
device->CreateCommittedResource(
|
||||
&heapProp,
|
||||
D3D12_HEAP_FLAG_NONE,
|
||||
&getBufferResourceDesc(16 * sizeof(float)),
|
||||
D3D12_RESOURCE_STATE_GENERIC_READ,
|
||||
nullptr,
|
||||
IID_PPV_ARGS(&m_vertexBuffer)
|
||||
));
|
||||
|
||||
void *tmp;
|
||||
m_vertexBuffer->Map(0, nullptr, &tmp);
|
||||
memcpy(tmp, quadVertex, 16 * sizeof(float));
|
||||
m_vertexBuffer->Unmap(0, nullptr);
|
||||
|
||||
D3D12_DESCRIPTOR_HEAP_DESC heapDesc = {};
|
||||
heapDesc.NumDescriptors = 2;
|
||||
heapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
|
||||
heapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
|
||||
|
||||
check(
|
||||
device->CreateDescriptorHeap(&heapDesc, IID_PPV_ARGS(&m_textureDescriptorHeap))
|
||||
);
|
||||
heapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
|
||||
check(
|
||||
device->CreateDescriptorHeap(&heapDesc, IID_PPV_ARGS(&m_samplerDescriptorHeap))
|
||||
);
|
||||
}
|
||||
|
||||
void D3D12GSRender::Shader::Release()
|
||||
{
|
||||
@ -523,24 +305,7 @@ D3D12GSRender::D3D12GSRender()
|
||||
m_perFrameStorage[1].Init(m_device);
|
||||
m_perFrameStorage[1].Reset();
|
||||
|
||||
// Convert shader
|
||||
const auto &p = compileF32toU8CS();
|
||||
check(
|
||||
m_device->CreateRootSignature(0, p.second->GetBufferPointer(), p.second->GetBufferSize(), IID_PPV_ARGS(&m_convertRootSignature))
|
||||
);
|
||||
|
||||
D3D12_COMPUTE_PIPELINE_STATE_DESC computePipelineStateDesc = {};
|
||||
computePipelineStateDesc.CS.BytecodeLength = p.first->GetBufferSize();
|
||||
computePipelineStateDesc.CS.pShaderBytecode = p.first->GetBufferPointer();
|
||||
computePipelineStateDesc.pRootSignature = m_convertRootSignature;
|
||||
|
||||
check(
|
||||
m_device->CreateComputePipelineState(&computePipelineStateDesc, IID_PPV_ARGS(&m_convertPSO))
|
||||
);
|
||||
|
||||
p.first->Release();
|
||||
p.second->Release();
|
||||
|
||||
initConvertShader();
|
||||
m_outputScalingPass.Init(m_device);
|
||||
|
||||
D3D12_HEAP_PROPERTIES hp = {};
|
||||
|
||||
@ -284,6 +284,7 @@ private:
|
||||
*/
|
||||
ID3D12PipelineState *m_convertPSO;
|
||||
ID3D12RootSignature *m_convertRootSignature;
|
||||
void initConvertShader();
|
||||
|
||||
|
||||
/**
|
||||
|
||||
248
rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
Normal file
248
rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
Normal file
@ -0,0 +1,248 @@
|
||||
/**
|
||||
* Contains utility shaders
|
||||
*/
|
||||
#include "stdafx.h"
|
||||
#if defined(DX12_SUPPORT)
|
||||
#include "D3D12GSRender.h"
|
||||
#include <d3dcompiler.h>
|
||||
#define STRINGIFY(x) #x
|
||||
|
||||
extern PFN_D3D12_SERIALIZE_ROOT_SIGNATURE wrapD3D12SerializeRootSignature;
|
||||
|
||||
/**
|
||||
* returns bytecode and root signature of a Compute Shader converting texture from
|
||||
* one format to another
|
||||
*/
|
||||
static
|
||||
std::pair<ID3DBlob *, ID3DBlob *> compileF32toU8CS()
|
||||
{
|
||||
const char *shaderCode = STRINGIFY(
|
||||
Texture2D<float> InputTexture : register(t0); \n
|
||||
RWTexture2D<float> OutputTexture : register(u0);\n
|
||||
|
||||
[numthreads(8, 8, 1)]\n
|
||||
void main(uint3 Id : SV_DispatchThreadID)\n
|
||||
{ \n
|
||||
OutputTexture[Id.xy] = InputTexture.Load(uint3(Id.xy, 0));\n
|
||||
}
|
||||
);
|
||||
|
||||
ID3DBlob *bytecode;
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> errorBlob;
|
||||
HRESULT hr = D3DCompile(shaderCode, strlen(shaderCode), "test", nullptr, nullptr, "main", "cs_5_0", 0, 0, &bytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
D3D12_DESCRIPTOR_RANGE descriptorRange[2] = {};
|
||||
// Textures
|
||||
descriptorRange[0].BaseShaderRegister = 0;
|
||||
descriptorRange[0].NumDescriptors = 1;
|
||||
descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
|
||||
descriptorRange[1].BaseShaderRegister = 0;
|
||||
descriptorRange[1].NumDescriptors = 1;
|
||||
descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
|
||||
descriptorRange[1].OffsetInDescriptorsFromTableStart = 1;
|
||||
D3D12_ROOT_PARAMETER RP[2] = {};
|
||||
RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[0].DescriptorTable.pDescriptorRanges = &descriptorRange[0];
|
||||
RP[0].DescriptorTable.NumDescriptorRanges = 2;
|
||||
|
||||
D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc = {};
|
||||
rootSignatureDesc.NumParameters = 1;
|
||||
rootSignatureDesc.pParameters = RP;
|
||||
|
||||
ID3DBlob *rootSignatureBlob;
|
||||
|
||||
hr = wrapD3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &rootSignatureBlob, &errorBlob);
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
return std::make_pair(bytecode, rootSignatureBlob);
|
||||
}
|
||||
|
||||
|
||||
void D3D12GSRender::Shader::Init(ID3D12Device *device)
|
||||
{
|
||||
const char *fsCode = STRINGIFY(
|
||||
Texture2D InputTexture : register(t0); \n
|
||||
sampler bilinearSampler : register(s0); \n
|
||||
|
||||
struct PixelInput \n
|
||||
{ \n
|
||||
float4 Pos : SV_POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
float4 main(PixelInput In) : SV_TARGET \n
|
||||
{ \n
|
||||
return InputTexture.Sample(bilinearSampler, In.TexCoords); \n
|
||||
}
|
||||
);
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> fsBytecode;
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> errorBlob;
|
||||
HRESULT hr = D3DCompile(fsCode, strlen(fsCode), "test", nullptr, nullptr, "main", "ps_5_0", 0, 0, &fsBytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
const char *vsCode = STRINGIFY(
|
||||
struct VertexInput \n
|
||||
{ \n
|
||||
float2 Pos : POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
struct PixelInput \n
|
||||
{ \n
|
||||
float4 Pos : SV_POSITION; \n
|
||||
float2 TexCoords : TEXCOORDS0; \n
|
||||
}; \n
|
||||
|
||||
PixelInput main(VertexInput In) \n
|
||||
{ \n
|
||||
PixelInput Out; \n
|
||||
Out.Pos = float4(In.Pos, 0., 1.); \n
|
||||
Out.TexCoords = In.TexCoords; \n
|
||||
return Out; \n
|
||||
}
|
||||
);
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> vsBytecode;
|
||||
hr = D3DCompile(vsCode, strlen(vsCode), "test", nullptr, nullptr, "main", "vs_5_0", 0, 0, &vsBytecode, errorBlob.GetAddressOf());
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
D3D12_GRAPHICS_PIPELINE_STATE_DESC psoDesc = {};
|
||||
psoDesc.PS.BytecodeLength = fsBytecode->GetBufferSize();
|
||||
psoDesc.PS.pShaderBytecode = fsBytecode->GetBufferPointer();
|
||||
psoDesc.VS.BytecodeLength = vsBytecode->GetBufferSize();
|
||||
psoDesc.VS.pShaderBytecode = vsBytecode->GetBufferPointer();
|
||||
psoDesc.NumRenderTargets = 1;
|
||||
psoDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
|
||||
psoDesc.SampleDesc.Count = 1;
|
||||
psoDesc.SampleMask = UINT_MAX;
|
||||
|
||||
D3D12_INPUT_ELEMENT_DESC IADesc[2] = {};
|
||||
IADesc[0].SemanticName = "POSITION";
|
||||
IADesc[0].Format = DXGI_FORMAT_R32G32_FLOAT;
|
||||
IADesc[1].SemanticName = "TEXCOORDS";
|
||||
IADesc[1].Format = DXGI_FORMAT_R32G32_FLOAT;
|
||||
IADesc[1].AlignedByteOffset = 2 * sizeof(float);
|
||||
|
||||
psoDesc.InputLayout.NumElements = 2;
|
||||
psoDesc.InputLayout.pInputElementDescs = IADesc;
|
||||
|
||||
psoDesc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
|
||||
psoDesc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID;
|
||||
|
||||
D3D12_DESCRIPTOR_RANGE descriptorRange[2] = {};
|
||||
// Textures
|
||||
descriptorRange[0].BaseShaderRegister = 0;
|
||||
descriptorRange[0].NumDescriptors = 1;
|
||||
descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;
|
||||
descriptorRange[1].BaseShaderRegister = 0;
|
||||
descriptorRange[1].NumDescriptors = 1;
|
||||
descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER;
|
||||
D3D12_ROOT_PARAMETER RP[2] = {};
|
||||
RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[0].DescriptorTable.pDescriptorRanges = &descriptorRange[0];
|
||||
RP[0].DescriptorTable.NumDescriptorRanges = 1;
|
||||
RP[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
|
||||
RP[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
|
||||
RP[1].DescriptorTable.pDescriptorRanges = &descriptorRange[1];
|
||||
RP[1].DescriptorTable.NumDescriptorRanges = 1;
|
||||
|
||||
D3D12_ROOT_SIGNATURE_DESC rootSignatureDesc = {};
|
||||
rootSignatureDesc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
|
||||
rootSignatureDesc.NumParameters = 2;
|
||||
rootSignatureDesc.pParameters = RP;
|
||||
|
||||
Microsoft::WRL::ComPtr<ID3DBlob> rootSignatureBlob;
|
||||
|
||||
hr = wrapD3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &rootSignatureBlob, &errorBlob);
|
||||
if (hr != S_OK)
|
||||
{
|
||||
const char *tmp = (const char*)errorBlob->GetBufferPointer();
|
||||
LOG_ERROR(RSX, tmp);
|
||||
}
|
||||
|
||||
hr = device->CreateRootSignature(0, rootSignatureBlob->GetBufferPointer(), rootSignatureBlob->GetBufferSize(), IID_PPV_ARGS(&m_rootSignature));
|
||||
|
||||
psoDesc.pRootSignature = m_rootSignature;
|
||||
psoDesc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
|
||||
psoDesc.BlendState.RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL;
|
||||
|
||||
check(device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&m_PSO)));
|
||||
|
||||
|
||||
float quadVertex[16] = {
|
||||
-1., -1., 0., 1.,
|
||||
-1., 1., 0., 0.,
|
||||
1., -1., 1., 1.,
|
||||
1., 1., 1., 0.,
|
||||
};
|
||||
|
||||
D3D12_HEAP_PROPERTIES heapProp = {};
|
||||
heapProp.Type = D3D12_HEAP_TYPE_UPLOAD;
|
||||
check(
|
||||
device->CreateCommittedResource(
|
||||
&heapProp,
|
||||
D3D12_HEAP_FLAG_NONE,
|
||||
&getBufferResourceDesc(16 * sizeof(float)),
|
||||
D3D12_RESOURCE_STATE_GENERIC_READ,
|
||||
nullptr,
|
||||
IID_PPV_ARGS(&m_vertexBuffer)
|
||||
));
|
||||
|
||||
void *tmp;
|
||||
m_vertexBuffer->Map(0, nullptr, &tmp);
|
||||
memcpy(tmp, quadVertex, 16 * sizeof(float));
|
||||
m_vertexBuffer->Unmap(0, nullptr);
|
||||
|
||||
D3D12_DESCRIPTOR_HEAP_DESC heapDesc = {};
|
||||
heapDesc.NumDescriptors = 2;
|
||||
heapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
|
||||
heapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
|
||||
|
||||
check(
|
||||
device->CreateDescriptorHeap(&heapDesc, IID_PPV_ARGS(&m_textureDescriptorHeap))
|
||||
);
|
||||
heapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
|
||||
check(
|
||||
device->CreateDescriptorHeap(&heapDesc, IID_PPV_ARGS(&m_samplerDescriptorHeap))
|
||||
);
|
||||
}
|
||||
|
||||
void D3D12GSRender::initConvertShader()
|
||||
{
|
||||
const auto &p = compileF32toU8CS();
|
||||
check(
|
||||
m_device->CreateRootSignature(0, p.second->GetBufferPointer(), p.second->GetBufferSize(), IID_PPV_ARGS(&m_convertRootSignature))
|
||||
);
|
||||
|
||||
D3D12_COMPUTE_PIPELINE_STATE_DESC computePipelineStateDesc = {};
|
||||
computePipelineStateDesc.CS.BytecodeLength = p.first->GetBufferSize();
|
||||
computePipelineStateDesc.CS.pShaderBytecode = p.first->GetBufferPointer();
|
||||
computePipelineStateDesc.pRootSignature = m_convertRootSignature;
|
||||
|
||||
check(
|
||||
m_device->CreateComputePipelineState(&computePipelineStateDesc, IID_PPV_ARGS(&m_convertPSO))
|
||||
);
|
||||
|
||||
p.first->Release();
|
||||
p.second->Release();
|
||||
}
|
||||
#endif
|
||||
@ -47,6 +47,7 @@
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12PipelineState.cpp" />
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12RenderTargetSets.cpp" />
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12Texture.cpp" />
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12Utils.cpp" />
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12VertexProgramDecompiler.cpp" />
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12CommonDecompiler.cpp" />
|
||||
<ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
|
||||
|
||||
@ -992,6 +992,9 @@
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12Texture.cpp">
|
||||
<Filter>Emu\GPU\RSX\D3D12</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Emu\RSX\D3D12\D3D12Utils.cpp">
|
||||
<Filter>Emu\GPU\RSX\D3D12</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Crypto\aes.h">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user