backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] move supported query check to d3d11_query

Browse Source 
it's better to have everything in one place.
This commit is contained in:
Clément Guérin 2018-01-13 23:35:33 -08:00
parent 2844d4bad7
commit fc43b83623
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d3d11/d3d11_device.cpp
View File

@ -1063,15 +1063,9 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D11Device::CreateQuery( HRESULT STDMETHODCALLTYPE D3D11Device::CreateQuery(
const D3D11_QUERY_DESC* pQueryDesc, const D3D11_QUERY_DESC* pQueryDesc,
ID3D11Query** ppQuery) { ID3D11Query** ppQuery) {
// Other query types are currently unsupported
if (pQueryDesc->Query != D3D11_QUERY_OCCLUSION
&& pQueryDesc->Query != D3D11_QUERY_OCCLUSION_PREDICATE) {
Logger::warn(str::format("D3D11Device: Unsupported query type: ", pQueryDesc->Query));
}
if (ppQuery == nullptr) if (ppQuery == nullptr)
return S_FALSE; return S_FALSE;
try { try {
*ppQuery = ref(new D3D11Query(this, *pQueryDesc)); *ppQuery = ref(new D3D11Query(this, *pQueryDesc));
return S_OK; return S_OK;

10
src/d3d11/d3d11_query.cpp
View File

@ -7,7 +7,15 @@ namespace dxvk {
D3D11Device* device, D3D11Device* device,
const D3D11_QUERY_DESC& desc) const D3D11_QUERY_DESC& desc)
: m_device(device), m_desc(desc) { : m_device(device), m_desc(desc) {
Logger::warn("D3D11Query: Stub"); switch (desc.Query) {
// Other query types are currently unsupported
case D3D11_QUERY_OCCLUSION:
case D3D11_QUERY_OCCLUSION_PREDICATE:
break;
default:
Logger::warn(str::format("D3D11Query: Unsupported query type ", desc.Query));
}
} }