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

[d3d11] Use new GPU events for D3D11 Event queries

Browse Source
This commit is contained in:
Philip Rebohle 2018-11-16 23:54:44 +01:00
parent 3dbd755075
commit 8c3900c533
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_context_imm.cpp
View File

@ -89,6 +89,10 @@ namespace dxvk {
return E_INVALIDARG;
}
// Ensure that all query commands actually get
// executed before trying to access the query
SynchronizeCsThread();
// Get query status directly from the query object
HRESULT hr = static_cast<D3D11Query*>(pAsync)->GetData(pData, GetDataFlags);

21
src/d3d11/d3d11_query.cpp
View File

@ -8,9 +8,11 @@ namespace dxvk {
const D3D11_QUERY_DESC& desc)
: m_device(device), m_desc(desc),
m_d3d10(this, device->GetD3D10Interface()) {
Rc<DxvkDevice> dxvkDevice = m_device->GetDXVKDevice();
switch (m_desc.Query) {
case D3D11_QUERY_EVENT:
m_event = new DxvkEvent();
m_event = dxvkDevice->createGpuEvent();
break;
case D3D11_QUERY_OCCLUSION:
@ -171,9 +173,6 @@ namespace dxvk {
if (m_query != nullptr)
return m_query->reset();
if (m_event != nullptr)
return m_event->reset();
return 0;
}
@ -205,8 +204,7 @@ namespace dxvk {
void D3D11Query::Signal(DxvkContext* ctx, uint32_t revision) {
switch (m_desc.Query) {
case D3D11_QUERY_EVENT: {
DxvkEventRevision rev = { m_event, revision };
ctx->signalEvent(rev);
ctx->signalGpuEvent(m_event);
} break;
case D3D11_QUERY_TIMESTAMP: {
@ -224,7 +222,16 @@ namespace dxvk {
void* pData,
UINT GetDataFlags) {
if (m_desc.Query == D3D11_QUERY_EVENT) {
const bool signaled = m_event->getStatus() == DxvkEventStatus::Signaled;
DxvkGpuEventStatus status = m_event->test();
if (status == DxvkGpuEventStatus::Invalid)
return DXGI_ERROR_INVALID_CALL;
bool signaled = status == DxvkGpuEventStatus::Signaled;
// FIXME remove once query refactor is done
if (m_event->isInUse())
signaled = false;
if (pData != nullptr)
*static_cast<BOOL*>(pData) = signaled;

6
src/d3d11/d3d11_query.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "../dxvk/dxvk_event.h"
#include "../dxvk/dxvk_gpu_event.h"
#include "../dxvk/dxvk_query.h"
#include "../d3d10/d3d10_query.h"
@ -54,8 +54,8 @@ namespace dxvk {
D3D11Device* const m_device;
D3D11_QUERY_DESC m_desc;
Rc<DxvkQuery> m_query = nullptr;
Rc<DxvkEvent> m_event = nullptr;
Rc<DxvkQuery> m_query = nullptr;
Rc<DxvkGpuEvent> m_event = nullptr;
uint32_t m_revision = 0;