rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-30 20:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Remove push constant block for now

Browse Source 
This needs some more work.
This commit is contained in:
Philip Rebohle 2018-02-03 10:36:17 +01:00
parent a567f6a5a5
commit 201cb88d27
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dxbc/dxbc_compiler.cpp
View File

@ -4482,8 +4482,6 @@ namespace dxvk {
m_module.enableCapability(spv::CapabilityShader); m_module.enableCapability(spv::CapabilityShader);
m_module.enableCapability(spv::CapabilityImageQuery); m_module.enableCapability(spv::CapabilityImageQuery);
m_pushConstantBlock = getPushConstantBlockId();
// Initialize the shader module with capabilities // Initialize the shader module with capabilities
// etc. Each shader type has its own peculiarities. // etc. Each shader type has its own peculiarities.
switch (m_version.type()) { switch (m_version.type()) {
@ -4921,32 +4919,4 @@ namespace dxvk {
return typeId; return typeId;
} }
uint32_t DxbcCompiler::getPushConstantBlockId() {
uint32_t t_u32 = m_module.defIntType(32, 0);
std::array<uint32_t, 1> members;
members[PushConstant_InstanceId] = t_u32;
uint32_t typeId = m_module.defStructTypeUnique(
members.size(), members.data());
m_module.memberDecorateOffset(typeId, 0, 0);
m_module.decorateBlock(typeId);
m_module.setDebugName(typeId, "s_push_constant");
m_module.setDebugMemberName(typeId, PerVertex_Position, "instance_id");
// There's only ever going to be one single push constant
// block per shader, so we'll declare the variable here
uint32_t ptrTypeId = m_module.defPointerType(
typeId, spv::StorageClassPushConstant);
uint32_t varId = m_module.newVar(
ptrTypeId, spv::StorageClassPushConstant);
m_module.setDebugName(varId, "push_constant");
return varId;
}
} }

35
src/dxvk/dxvk_context.cpp
View File

@ -572,16 +572,9 @@ namespace dxvk {
this->commitGraphicsState(); this->commitGraphicsState();
if (m_gpActivePipeline != VK_NULL_HANDLE) { if (m_gpActivePipeline != VK_NULL_HANDLE) {
if (!m_flags.test(DxvkContextFlag::GpEmulateInstanceFetchRate)) { m_cmd->cmdDraw(
m_cmd->cmdDraw( vertexCount, instanceCount,
vertexCount, instanceCount, firstVertex, firstInstance);
firstVertex, firstInstance);
} else {
static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::warn("Dxvk: GpEmulateInstanceFetchRate not supported for direct draws");
}
} }
} }
@ -595,17 +588,10 @@ namespace dxvk {
if (m_gpActivePipeline != VK_NULL_HANDLE) { if (m_gpActivePipeline != VK_NULL_HANDLE) {
auto physicalSlice = buffer.physicalSlice(); auto physicalSlice = buffer.physicalSlice();
if (!m_flags.test(DxvkContextFlag::GpEmulateInstanceFetchRate)) { m_cmd->cmdDrawIndirect(
m_cmd->cmdDrawIndirect( physicalSlice.handle(),
physicalSlice.handle(), physicalSlice.offset(),
physicalSlice.offset(), count, stride);
count, stride);
} else {
static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::warn("Dxvk: GpEmulateInstanceFetchRate not supported for indirect draws");
}
} }
} }
@ -1083,6 +1069,13 @@ namespace dxvk {
m_state.gp.state.ilAttributeCount = attributeCount; m_state.gp.state.ilAttributeCount = attributeCount;
m_state.gp.state.ilBindingCount = bindingCount; m_state.gp.state.ilBindingCount = bindingCount;
if (m_flags.test(DxvkContextFlag::GpEmulateInstanceFetchRate)) {
static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::warn("Dxvk: GpEmulateInstanceFetchRate not handled yet");
}
} }