rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-12 03:02:33 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Pass VS and FS libraries to graphics pipelines

Browse Source
This commit is contained in:
Philip Rebohle 2022-07-06 02:07:17 +02:00
parent cb56e16a4b
commit a72bf02374
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dxvk/dxvk_graphics.cpp
View File

@ -461,14 +461,18 @@ namespace dxvk {
DxvkDevice* device, DxvkDevice* device,
DxvkPipelineManager* pipeMgr, DxvkPipelineManager* pipeMgr,
DxvkGraphicsPipelineShaders shaders, DxvkGraphicsPipelineShaders shaders,
DxvkBindingLayoutObjects* layout) DxvkBindingLayoutObjects* layout,
DxvkShaderPipelineLibrary* vsLibrary,
DxvkShaderPipelineLibrary* fsLibrary)
: m_device (device), : m_device (device),
m_cache (&pipeMgr->m_cache), m_cache (&pipeMgr->m_cache),
m_stateCache (&pipeMgr->m_stateCache), m_stateCache (&pipeMgr->m_stateCache),
m_stats (&pipeMgr->m_stats), m_stats (&pipeMgr->m_stats),
m_shaders (std::move(shaders)), m_shaders (std::move(shaders)),
m_bindings (layout), m_bindings (layout),
m_barrier (layout->getGlobalBarrier()) { m_barrier (layout->getGlobalBarrier()),
m_vsLibrary (vsLibrary),
m_fsLibrary (fsLibrary) {
m_vsIn = m_shaders.vs != nullptr ? m_shaders.vs->info().inputMask : 0; m_vsIn = m_shaders.vs != nullptr ? m_shaders.vs->info().inputMask : 0;
m_fsOut = m_shaders.fs != nullptr ? m_shaders.fs->info().outputMask : 0; m_fsOut = m_shaders.fs != nullptr ? m_shaders.fs->info().outputMask : 0;

7
src/dxvk/dxvk_graphics.h
View File

@ -292,7 +292,9 @@ namespace dxvk {
DxvkDevice* device, DxvkDevice* device,
DxvkPipelineManager* pipeMgr, DxvkPipelineManager* pipeMgr,
DxvkGraphicsPipelineShaders shaders, DxvkGraphicsPipelineShaders shaders,
DxvkBindingLayoutObjects* layout); DxvkBindingLayoutObjects* layout,
DxvkShaderPipelineLibrary* vsLibrary,
DxvkShaderPipelineLibrary* fsLibrary);
~DxvkGraphicsPipeline(); ~DxvkGraphicsPipeline();
@ -381,6 +383,9 @@ namespace dxvk {
DxvkGlobalPipelineBarrier m_barrier; DxvkGlobalPipelineBarrier m_barrier;
DxvkGraphicsPipelineFlags m_flags; DxvkGraphicsPipelineFlags m_flags;
DxvkShaderPipelineLibrary* m_vsLibrary;
DxvkShaderPipelineLibrary* m_fsLibrary;
uint32_t m_vsIn = 0; uint32_t m_vsIn = 0;
uint32_t m_fsOut = 0; uint32_t m_fsOut = 0;

12
src/dxvk/dxvk_pipemanager.cpp
View File

@ -227,10 +227,20 @@ namespace dxvk {
auto layout = createPipelineLayout(mergedLayout); auto layout = createPipelineLayout(mergedLayout);
DxvkShaderPipelineLibrary* vsLibrary = nullptr;
DxvkShaderPipelineLibrary* fsLibrary = nullptr;
if (shaders.tcs == nullptr && shaders.tes == nullptr && shaders.gs == nullptr) {
// TODO handle null fs properly
vsLibrary = findPipelineLibrary(shaders.vs);
fsLibrary = findPipelineLibrary(shaders.fs);
}
auto iter = m_graphicsPipelines.emplace( auto iter = m_graphicsPipelines.emplace(
std::piecewise_construct, std::piecewise_construct,
std::tuple(shaders), std::tuple(shaders),
std::tuple(m_device, this, shaders, layout)); std::tuple(m_device, this, shaders,
layout, vsLibrary, fsLibrary));
return &iter.first->second; return &iter.first->second;
} }