izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bind constant buffers where you define them

Browse Source 
And remove possible slot collisions.
This commit is contained in:
ns6089
2023-08-20 08:36:06 +03:00
committed by Cameron Gutman
parent f2ed4bece9
commit 4094fef67a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/windows/display_vram.cpp
+3 -4
View File
@@ -435,7 +435,6 @@ namespace platf::dxgi {
return; return;
} }
device_ctx->VSSetConstantBuffers(0, 1, &info_scene);
device_ctx->PSSetConstantBuffers(0, 1, &color_matrix); device_ctx->PSSetConstantBuffers(0, 1, &color_matrix);
this->color_matrix = std::move(color_matrix); this->color_matrix = std::move(color_matrix);
} }
@@ -471,6 +470,7 @@ namespace platf::dxgi {
BOOST_LOG(error) << "Failed to create info scene buffer"sv; BOOST_LOG(error) << "Failed to create info scene buffer"sv;
return -1; return -1;
} }
device_ctx->VSSetConstantBuffers(0, 1, &info_scene);
D3D11_RENDER_TARGET_VIEW_DESC nv12_rt_desc { D3D11_RENDER_TARGET_VIEW_DESC nv12_rt_desc {
format == DXGI_FORMAT_P010 ? DXGI_FORMAT_R16_UNORM : DXGI_FORMAT_R8_UNORM, format == DXGI_FORMAT_P010 ? DXGI_FORMAT_R16_UNORM : DXGI_FORMAT_R8_UNORM,
@@ -607,6 +607,7 @@ namespace platf::dxgi {
BOOST_LOG(error) << "Failed to create color matrix buffer"sv; BOOST_LOG(error) << "Failed to create color matrix buffer"sv;
return -1; return -1;
} }
device_ctx->PSSetConstantBuffers(0, 1, &color_matrix);
D3D11_INPUT_ELEMENT_DESC layout_desc { D3D11_INPUT_ELEMENT_DESC layout_desc {
"SV_Position", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 "SV_Position", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0
@@ -640,8 +641,6 @@ namespace platf::dxgi {
} }
device_ctx->IASetInputLayout(input_layout.get()); device_ctx->IASetInputLayout(input_layout.get());
device_ctx->PSSetConstantBuffers(0, 1, &color_matrix);
device_ctx->VSSetConstantBuffers(0, 1, &info_scene);
device_ctx->OMSetBlendState(blend_disable.get(), nullptr, 0xFFFFFFFFu); device_ctx->OMSetBlendState(blend_disable.get(), nullptr, 0xFFFFFFFFu);
device_ctx->PSSetSamplers(0, 1, &sampler_linear); device_ctx->PSSetSamplers(0, 1, &sampler_linear);
@@ -1367,7 +1366,7 @@ namespace platf::dxgi {
return -1; return -1;
} }
device_ctx->PSSetConstantBuffers(0, 1, &sdr_multiplier); device_ctx->PSSetConstantBuffers(1, 1, &sdr_multiplier);
} }
else { else {
status = device->CreatePixelShader(scene_ps_hlsl->GetBufferPointer(), scene_ps_hlsl->GetBufferSize(), nullptr, &scene_ps); status = device->CreatePixelShader(scene_ps_hlsl->GetBufferPointer(), scene_ps_hlsl->GetBufferSize(), nullptr, &scene_ps);
src_assets/windows/assets/shaders/directx/ScenePS_NW.hlsl
+1 -1
View File
@@ -8,7 +8,7 @@ struct PS_INPUT
float2 tex : TEXCOORD; float2 tex : TEXCOORD;
}; };
cbuffer SdrScaling : register(b0) { cbuffer SdrScaling : register(b1) {
float scale_factor; float scale_factor;
}; };