rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-01 16:24:12 +01:00
Code Issues Projects Releases Wiki Activity

[general] Added 32-bit support

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-12 12:50:52 +01:00
parent 23abc82aa0
commit 2a266eaad4
50 changed files with 596 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build-win32.txt Normal file
View File

@ -0,0 +1,19 @@
[binaries]
c = '/usr/bin/i686-w64-mingw32-gcc'
cpp = '/usr/bin/i686-w64-mingw32-g++'
ar = '/usr/bin/i686-w64-mingw32-ar'
strip = '/usr/bin/i686-w64-mingw32-strip'
exe_wrapper = 'wine'
[properties]
c_args = ['-Og', '-ggdb']
c_link_args = ['-static', '-static-libgcc']
cpp_args = ['-std=c++17', '-Og', '-gstabs']
cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias']
[host_machine]
system = 'windows'
cpu_family = 'x86'
cpu = 'x86'
endian = 'little'

BIN
lib32/SDL2.lib Executable file
View File

Binary file not shown.

BIN
lib32/vulkan-1.lib Executable file
View File

Binary file not shown.

13
meson.build
View File

@ -1,11 +1,22 @@
project('dxvk', ['c', 'cpp']) project('dxvk', ['c', 'cpp'])
cpu_family = target_machine.cpu_family()
dxvk_compiler = meson.get_compiler('cpp') dxvk_compiler = meson.get_compiler('cpp')
dxvk_library_path = meson.source_root() + '/lib'
dxvk_include_path = include_directories('./include') dxvk_include_path = include_directories('./include')
if (cpu_family == 'x86_64')
dxvk_library_path = meson.source_root() + '/lib'
else
dxvk_library_path = meson.source_root() + '/lib32'
endif
lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
lib_sdl2 = dxvk_compiler.find_library('SDL2', dirs : dxvk_library_path) lib_sdl2 = dxvk_compiler.find_library('SDL2', dirs : dxvk_library_path)
lib_d3d11 = dxvk_compiler.find_library('d3d11')
lib_dxgi = dxvk_compiler.find_library('dxgi')
lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
subdir('src') subdir('src')
subdir('tests') subdir('tests')

6
src/d3d11/d3d11_blend.cpp
View File

@ -36,7 +36,7 @@ namespace dxvk {
} }
HRESULT D3D11BlendState::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11BlendState::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11BlendState); COM_QUERY_IFACE(riid, ppvObject, ID3D11BlendState);
@ -46,12 +46,12 @@ namespace dxvk {
} }
void D3D11BlendState::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11BlendState::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = ref(m_device); *ppDevice = ref(m_device);
} }
void D3D11BlendState::GetDesc(D3D11_BLEND_DESC* pDesc) { void STDMETHODCALLTYPE D3D11BlendState::GetDesc(D3D11_BLEND_DESC* pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

6
src/d3d11/d3d11_blend.h
View File

@ -20,14 +20,14 @@ namespace dxvk {
const D3D11_BLEND_DESC& desc); const D3D11_BLEND_DESC& desc);
~D3D11BlendState(); ~D3D11BlendState();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_BLEND_DESC* pDesc) final; D3D11_BLEND_DESC* pDesc) final;
void BindToContext( void BindToContext(

12
src/d3d11/d3d11_buffer.cpp
View File

@ -19,7 +19,7 @@ namespace dxvk {
} }
HRESULT D3D11Buffer::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11Buffer::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11Resource); COM_QUERY_IFACE(riid, ppvObject, ID3D11Resource);
@ -34,29 +34,29 @@ namespace dxvk {
} }
void D3D11Buffer::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11Buffer::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
UINT D3D11Buffer::GetEvictionPriority() { UINT STDMETHODCALLTYPE D3D11Buffer::GetEvictionPriority() {
UINT EvictionPriority = DXGI_RESOURCE_PRIORITY_NORMAL; UINT EvictionPriority = DXGI_RESOURCE_PRIORITY_NORMAL;
m_resource->GetEvictionPriority(&EvictionPriority); m_resource->GetEvictionPriority(&EvictionPriority);
return EvictionPriority; return EvictionPriority;
} }
void D3D11Buffer::SetEvictionPriority(UINT EvictionPriority) { void STDMETHODCALLTYPE D3D11Buffer::SetEvictionPriority(UINT EvictionPriority) {
m_resource->SetEvictionPriority(EvictionPriority); m_resource->SetEvictionPriority(EvictionPriority);
} }
void D3D11Buffer::GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension) { void STDMETHODCALLTYPE D3D11Buffer::GetType(D3D11_RESOURCE_DIMENSION* pResourceDimension) {
*pResourceDimension = D3D11_RESOURCE_DIMENSION_BUFFER; *pResourceDimension = D3D11_RESOURCE_DIMENSION_BUFFER;
} }
void D3D11Buffer::GetDesc(D3D11_BUFFER_DESC* pDesc) { void STDMETHODCALLTYPE D3D11Buffer::GetDesc(D3D11_BUFFER_DESC* pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

12
src/d3d11/d3d11_buffer.h
View File

@ -20,21 +20,21 @@ namespace dxvk {
const D3D11_BUFFER_DESC& desc); const D3D11_BUFFER_DESC& desc);
~D3D11Buffer(); ~D3D11Buffer();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetType( void STDMETHODCALLTYPE GetType(
D3D11_RESOURCE_DIMENSION *pResourceDimension) final; D3D11_RESOURCE_DIMENSION *pResourceDimension) final;
UINT GetEvictionPriority() final; UINT STDMETHODCALLTYPE GetEvictionPriority() final;
void SetEvictionPriority(UINT EvictionPriority) final; void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_BUFFER_DESC *pDesc) final; D3D11_BUFFER_DESC *pDesc) final;
Rc<DxvkBuffer> GetDXVKBuffer(); Rc<DxvkBuffer> GetDXVKBuffer();

8
src/d3d11/d3d11_class_linkage.cpp
View File

@ -15,7 +15,7 @@ namespace dxvk {
} }
HRESULT D3D11ClassLinkage::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11ClassLinkage::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11ClassLinkage); COM_QUERY_IFACE(riid, ppvObject, ID3D11ClassLinkage);
@ -25,12 +25,12 @@ namespace dxvk {
} }
void D3D11ClassLinkage::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11ClassLinkage::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
HRESULT D3D11ClassLinkage::CreateClassInstance( HRESULT STDMETHODCALLTYPE D3D11ClassLinkage::CreateClassInstance(
LPCSTR pClassTypeName, LPCSTR pClassTypeName,
UINT ConstantBufferOffset, UINT ConstantBufferOffset,
UINT ConstantVectorOffset, UINT ConstantVectorOffset,
@ -42,7 +42,7 @@ namespace dxvk {
} }
HRESULT D3D11ClassLinkage::GetClassInstance( HRESULT STDMETHODCALLTYPE D3D11ClassLinkage::GetClassInstance(
LPCSTR pClassInstanceName, LPCSTR pClassInstanceName,
UINT InstanceIndex, UINT InstanceIndex,
ID3D11ClassInstance **ppInstance) { ID3D11ClassInstance **ppInstance) {

8
src/d3d11/d3d11_class_linkage.h
View File

@ -16,14 +16,14 @@ namespace dxvk {
~D3D11ClassLinkage(); ~D3D11ClassLinkage();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
HRESULT CreateClassInstance( HRESULT STDMETHODCALLTYPE CreateClassInstance(
LPCSTR pClassTypeName, LPCSTR pClassTypeName,
UINT ConstantBufferOffset, UINT ConstantBufferOffset,
UINT ConstantVectorOffset, UINT ConstantVectorOffset,
@ -31,7 +31,7 @@ namespace dxvk {
UINT SamplerOffset, UINT SamplerOffset,
ID3D11ClassInstance **ppInstance); ID3D11ClassInstance **ppInstance);
HRESULT GetClassInstance( HRESULT STDMETHODCALLTYPE GetClassInstance(
LPCSTR pClassInstanceName, LPCSTR pClassInstanceName,
UINT InstanceIndex, UINT InstanceIndex,
ID3D11ClassInstance **ppInstance); ID3D11ClassInstance **ppInstance);

224
src/d3d11/d3d11_context.cpp
View File

@ -47,17 +47,17 @@ namespace dxvk {
} }
ULONG D3D11DeviceContext::AddRef() { ULONG STDMETHODCALLTYPE D3D11DeviceContext::AddRef() {
return m_parent->AddRef(); return m_parent->AddRef();
} }
ULONG D3D11DeviceContext::Release() { ULONG STDMETHODCALLTYPE D3D11DeviceContext::Release() {
return m_parent->Release(); return m_parent->Release();
} }
HRESULT D3D11DeviceContext::QueryInterface( HRESULT STDMETHODCALLTYPE D3D11DeviceContext::QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) { void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
@ -69,22 +69,22 @@ namespace dxvk {
} }
void D3D11DeviceContext::GetDevice(ID3D11Device **ppDevice) { void STDMETHODCALLTYPE D3D11DeviceContext::GetDevice(ID3D11Device **ppDevice) {
*ppDevice = ref(m_parent); *ppDevice = ref(m_parent);
} }
D3D11_DEVICE_CONTEXT_TYPE D3D11DeviceContext::GetType() { D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE D3D11DeviceContext::GetType() {
return m_type; return m_type;
} }
UINT D3D11DeviceContext::GetContextFlags() { UINT STDMETHODCALLTYPE D3D11DeviceContext::GetContextFlags() {
return m_flags; return m_flags;
} }
void D3D11DeviceContext::ClearState() { void STDMETHODCALLTYPE D3D11DeviceContext::ClearState() {
this->IASetInputLayout(nullptr); this->IASetInputLayout(nullptr);
this->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED); this->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED);
this->IASetVertexBuffers(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, nullptr, nullptr, nullptr); this->IASetVertexBuffers(0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT, nullptr, nullptr, nullptr);
@ -134,7 +134,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::Flush() { void STDMETHODCALLTYPE D3D11DeviceContext::Flush() {
if (m_type == D3D11_DEVICE_CONTEXT_IMMEDIATE) { if (m_type == D3D11_DEVICE_CONTEXT_IMMEDIATE) {
m_device->submitCommandList( m_device->submitCommandList(
m_context->endRecording(), m_context->endRecording(),
@ -148,14 +148,14 @@ namespace dxvk {
} }
void D3D11DeviceContext::ExecuteCommandList( void STDMETHODCALLTYPE D3D11DeviceContext::ExecuteCommandList(
ID3D11CommandList* pCommandList, ID3D11CommandList* pCommandList,
WINBOOL RestoreContextState) { WINBOOL RestoreContextState) {
Logger::err("D3D11DeviceContext::ExecuteCommandList: Not implemented"); Logger::err("D3D11DeviceContext::ExecuteCommandList: Not implemented");
} }
HRESULT D3D11DeviceContext::FinishCommandList( HRESULT STDMETHODCALLTYPE D3D11DeviceContext::FinishCommandList(
WINBOOL RestoreDeferredContextState, WINBOOL RestoreDeferredContextState,
ID3D11CommandList **ppCommandList) { ID3D11CommandList **ppCommandList) {
if (m_type == D3D11_DEVICE_CONTEXT_DEFERRED) { if (m_type == D3D11_DEVICE_CONTEXT_DEFERRED) {
@ -168,7 +168,7 @@ namespace dxvk {
} }
HRESULT D3D11DeviceContext::Map( HRESULT STDMETHODCALLTYPE D3D11DeviceContext::Map(
ID3D11Resource* pResource, ID3D11Resource* pResource,
UINT Subresource, UINT Subresource,
D3D11_MAP MapType, D3D11_MAP MapType,
@ -210,7 +210,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::Unmap( void STDMETHODCALLTYPE D3D11DeviceContext::Unmap(
ID3D11Resource* pResource, ID3D11Resource* pResource,
UINT Subresource) { UINT Subresource) {
// There's literally nothing we have to do here at the moment // There's literally nothing we have to do here at the moment
@ -219,17 +219,17 @@ namespace dxvk {
} }
void D3D11DeviceContext::Begin(ID3D11Asynchronous *pAsync) { void STDMETHODCALLTYPE D3D11DeviceContext::Begin(ID3D11Asynchronous *pAsync) {
Logger::err("D3D11DeviceContext::Begin: Not implemented"); Logger::err("D3D11DeviceContext::Begin: Not implemented");
} }
void D3D11DeviceContext::End(ID3D11Asynchronous *pAsync) { void STDMETHODCALLTYPE D3D11DeviceContext::End(ID3D11Asynchronous *pAsync) {
Logger::err("D3D11DeviceContext::End: Not implemented"); Logger::err("D3D11DeviceContext::End: Not implemented");
} }
HRESULT D3D11DeviceContext::GetData( HRESULT STDMETHODCALLTYPE D3D11DeviceContext::GetData(
ID3D11Asynchronous* pAsync, ID3D11Asynchronous* pAsync,
void* pData, void* pData,
UINT DataSize, UINT DataSize,
@ -239,21 +239,21 @@ namespace dxvk {
} }
void D3D11DeviceContext::SetPredication( void STDMETHODCALLTYPE D3D11DeviceContext::SetPredication(
ID3D11Predicate* pPredicate, ID3D11Predicate* pPredicate,
WINBOOL PredicateValue) { WINBOOL PredicateValue) {
Logger::err("D3D11DeviceContext::SetPredication: Not implemented"); Logger::err("D3D11DeviceContext::SetPredication: Not implemented");
} }
void D3D11DeviceContext::GetPredication( void STDMETHODCALLTYPE D3D11DeviceContext::GetPredication(
ID3D11Predicate** ppPredicate, ID3D11Predicate** ppPredicate,
WINBOOL* pPredicateValue) { WINBOOL* pPredicateValue) {
Logger::err("D3D11DeviceContext::GetPredication: Not implemented"); Logger::err("D3D11DeviceContext::GetPredication: Not implemented");
} }
void D3D11DeviceContext::CopySubresourceRegion( void STDMETHODCALLTYPE D3D11DeviceContext::CopySubresourceRegion(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
UINT DstX, UINT DstX,
@ -266,14 +266,14 @@ namespace dxvk {
} }
void D3D11DeviceContext::CopyResource( void STDMETHODCALLTYPE D3D11DeviceContext::CopyResource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
ID3D11Resource* pSrcResource) { ID3D11Resource* pSrcResource) {
Logger::err("D3D11DeviceContext::CopyResource: Not implemented"); Logger::err("D3D11DeviceContext::CopyResource: Not implemented");
} }
void D3D11DeviceContext::CopyStructureCount( void STDMETHODCALLTYPE D3D11DeviceContext::CopyStructureCount(
ID3D11Buffer* pDstBuffer, ID3D11Buffer* pDstBuffer,
UINT DstAlignedByteOffset, UINT DstAlignedByteOffset,
ID3D11UnorderedAccessView* pSrcView) { ID3D11UnorderedAccessView* pSrcView) {
@ -281,7 +281,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::ClearRenderTargetView( void STDMETHODCALLTYPE D3D11DeviceContext::ClearRenderTargetView(
ID3D11RenderTargetView* pRenderTargetView, ID3D11RenderTargetView* pRenderTargetView,
const FLOAT ColorRGBA[4]) { const FLOAT ColorRGBA[4]) {
auto rtv = static_cast<D3D11RenderTargetView*>(pRenderTargetView); auto rtv = static_cast<D3D11RenderTargetView*>(pRenderTargetView);
@ -334,21 +334,21 @@ namespace dxvk {
} }
void D3D11DeviceContext::ClearUnorderedAccessViewUint( void STDMETHODCALLTYPE D3D11DeviceContext::ClearUnorderedAccessViewUint(
ID3D11UnorderedAccessView* pUnorderedAccessView, ID3D11UnorderedAccessView* pUnorderedAccessView,
const UINT Values[4]) { const UINT Values[4]) {
Logger::err("D3D11DeviceContext::ClearUnorderedAccessViewUint: Not implemented"); Logger::err("D3D11DeviceContext::ClearUnorderedAccessViewUint: Not implemented");
} }
void D3D11DeviceContext::ClearUnorderedAccessViewFloat( void STDMETHODCALLTYPE D3D11DeviceContext::ClearUnorderedAccessViewFloat(
ID3D11UnorderedAccessView* pUnorderedAccessView, ID3D11UnorderedAccessView* pUnorderedAccessView,
const FLOAT Values[4]) { const FLOAT Values[4]) {
Logger::err("D3D11DeviceContext::ClearUnorderedAccessViewFloat: Not implemented"); Logger::err("D3D11DeviceContext::ClearUnorderedAccessViewFloat: Not implemented");
} }
void D3D11DeviceContext::ClearDepthStencilView( void STDMETHODCALLTYPE D3D11DeviceContext::ClearDepthStencilView(
ID3D11DepthStencilView* pDepthStencilView, ID3D11DepthStencilView* pDepthStencilView,
UINT ClearFlags, UINT ClearFlags,
FLOAT Depth, FLOAT Depth,
@ -395,12 +395,12 @@ namespace dxvk {
} }
void D3D11DeviceContext::GenerateMips(ID3D11ShaderResourceView* pShaderResourceView) { void STDMETHODCALLTYPE D3D11DeviceContext::GenerateMips(ID3D11ShaderResourceView* pShaderResourceView) {
Logger::err("D3D11DeviceContext::GenerateMips: Not implemented"); Logger::err("D3D11DeviceContext::GenerateMips: Not implemented");
} }
void D3D11DeviceContext::UpdateSubresource( void STDMETHODCALLTYPE D3D11DeviceContext::UpdateSubresource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
const D3D11_BOX* pDstBox, const D3D11_BOX* pDstBox,
@ -436,20 +436,20 @@ namespace dxvk {
} }
void D3D11DeviceContext::SetResourceMinLOD( void STDMETHODCALLTYPE D3D11DeviceContext::SetResourceMinLOD(
ID3D11Resource* pResource, ID3D11Resource* pResource,
FLOAT MinLOD) { FLOAT MinLOD) {
Logger::err("D3D11DeviceContext::SetResourceMinLOD: Not implemented"); Logger::err("D3D11DeviceContext::SetResourceMinLOD: Not implemented");
} }
FLOAT D3D11DeviceContext::GetResourceMinLOD(ID3D11Resource* pResource) { FLOAT STDMETHODCALLTYPE D3D11DeviceContext::GetResourceMinLOD(ID3D11Resource* pResource) {
Logger::err("D3D11DeviceContext::GetResourceMinLOD: Not implemented"); Logger::err("D3D11DeviceContext::GetResourceMinLOD: Not implemented");
return 0.0f; return 0.0f;
} }
void D3D11DeviceContext::ResolveSubresource( void STDMETHODCALLTYPE D3D11DeviceContext::ResolveSubresource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
ID3D11Resource* pSrcResource, ID3D11Resource* pSrcResource,
@ -459,12 +459,12 @@ namespace dxvk {
} }
void D3D11DeviceContext::DrawAuto() { void STDMETHODCALLTYPE D3D11DeviceContext::DrawAuto() {
Logger::err("D3D11DeviceContext::DrawAuto: Not implemented"); Logger::err("D3D11DeviceContext::DrawAuto: Not implemented");
} }
void D3D11DeviceContext::Draw( void STDMETHODCALLTYPE D3D11DeviceContext::Draw(
UINT VertexCount, UINT VertexCount,
UINT StartVertexLocation) { UINT StartVertexLocation) {
m_context->draw( m_context->draw(
@ -473,7 +473,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DrawIndexed( void STDMETHODCALLTYPE D3D11DeviceContext::DrawIndexed(
UINT IndexCount, UINT IndexCount,
UINT StartIndexLocation, UINT StartIndexLocation,
INT BaseVertexLocation) { INT BaseVertexLocation) {
@ -484,7 +484,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DrawInstanced( void STDMETHODCALLTYPE D3D11DeviceContext::DrawInstanced(
UINT VertexCountPerInstance, UINT VertexCountPerInstance,
UINT InstanceCount, UINT InstanceCount,
UINT StartVertexLocation, UINT StartVertexLocation,
@ -497,7 +497,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DrawIndexedInstanced( void STDMETHODCALLTYPE D3D11DeviceContext::DrawIndexedInstanced(
UINT IndexCountPerInstance, UINT IndexCountPerInstance,
UINT InstanceCount, UINT InstanceCount,
UINT StartIndexLocation, UINT StartIndexLocation,
@ -512,21 +512,21 @@ namespace dxvk {
} }
void D3D11DeviceContext::DrawIndexedInstancedIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DrawIndexedInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DrawIndexedInstancedIndirect: Not implemented"); Logger::err("D3D11DeviceContext::DrawIndexedInstancedIndirect: Not implemented");
} }
void D3D11DeviceContext::DrawInstancedIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DrawInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DrawInstancedIndirect: Not implemented"); Logger::err("D3D11DeviceContext::DrawInstancedIndirect: Not implemented");
} }
void D3D11DeviceContext::Dispatch( void STDMETHODCALLTYPE D3D11DeviceContext::Dispatch(
UINT ThreadGroupCountX, UINT ThreadGroupCountX,
UINT ThreadGroupCountY, UINT ThreadGroupCountY,
UINT ThreadGroupCountZ) { UINT ThreadGroupCountZ) {
@ -537,14 +537,14 @@ namespace dxvk {
} }
void D3D11DeviceContext::DispatchIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DispatchIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DispatchIndirect: Not implemented"); Logger::err("D3D11DeviceContext::DispatchIndirect: Not implemented");
} }
void D3D11DeviceContext::IASetInputLayout(ID3D11InputLayout* pInputLayout) { void STDMETHODCALLTYPE D3D11DeviceContext::IASetInputLayout(ID3D11InputLayout* pInputLayout) {
auto inputLayout = static_cast<D3D11InputLayout*>(pInputLayout); auto inputLayout = static_cast<D3D11InputLayout*>(pInputLayout);
if (m_state.ia.inputLayout != inputLayout) { if (m_state.ia.inputLayout != inputLayout) {
@ -558,7 +558,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology) { void STDMETHODCALLTYPE D3D11DeviceContext::IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY Topology) {
if (m_state.ia.primitiveTopology != Topology) { if (m_state.ia.primitiveTopology != Topology) {
m_state.ia.primitiveTopology = Topology; m_state.ia.primitiveTopology = Topology;
@ -624,7 +624,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::IASetVertexBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::IASetVertexBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppVertexBuffers, ID3D11Buffer* const* ppVertexBuffers,
@ -662,7 +662,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::IASetIndexBuffer( void STDMETHODCALLTYPE D3D11DeviceContext::IASetIndexBuffer(
ID3D11Buffer* pIndexBuffer, ID3D11Buffer* pIndexBuffer,
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT Offset) { UINT Offset) {
@ -701,17 +701,17 @@ namespace dxvk {
} }
void D3D11DeviceContext::IAGetInputLayout(ID3D11InputLayout** ppInputLayout) { void STDMETHODCALLTYPE D3D11DeviceContext::IAGetInputLayout(ID3D11InputLayout** ppInputLayout) {
*ppInputLayout = m_state.ia.inputLayout.ref(); *ppInputLayout = m_state.ia.inputLayout.ref();
} }
void D3D11DeviceContext::IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology) { void STDMETHODCALLTYPE D3D11DeviceContext::IAGetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY* pTopology) {
*pTopology = m_state.ia.primitiveTopology; *pTopology = m_state.ia.primitiveTopology;
} }
void D3D11DeviceContext::IAGetVertexBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::IAGetVertexBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppVertexBuffers, ID3D11Buffer** ppVertexBuffers,
@ -721,7 +721,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::IAGetIndexBuffer( void STDMETHODCALLTYPE D3D11DeviceContext::IAGetIndexBuffer(
ID3D11Buffer** pIndexBuffer, ID3D11Buffer** pIndexBuffer,
DXGI_FORMAT* Format, DXGI_FORMAT* Format,
UINT* Offset) { UINT* Offset) {
@ -729,7 +729,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::VSSetShader(
ID3D11VertexShader* pVertexShader, ID3D11VertexShader* pVertexShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -747,7 +747,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::VSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -759,7 +759,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::VSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -771,7 +771,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::VSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -783,7 +783,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::VSGetShader(
ID3D11VertexShader** ppVertexShader, ID3D11VertexShader** ppVertexShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -797,7 +797,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::VSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -805,7 +805,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::VSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -813,7 +813,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::VSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::VSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -821,7 +821,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::HSSetShader(
ID3D11HullShader* pHullShader, ID3D11HullShader* pHullShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -830,7 +830,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::HSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -838,7 +838,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::HSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -846,7 +846,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::HSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -854,7 +854,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::HSGetShader(
ID3D11HullShader** ppHullShader, ID3D11HullShader** ppHullShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -862,7 +862,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::HSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -870,7 +870,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::HSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -878,7 +878,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::HSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::HSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -886,7 +886,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::DSSetShader(
ID3D11DomainShader* pDomainShader, ID3D11DomainShader* pDomainShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -895,7 +895,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::DSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -903,7 +903,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::DSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -911,7 +911,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::DSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -919,7 +919,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::DSGetShader(
ID3D11DomainShader** ppDomainShader, ID3D11DomainShader** ppDomainShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -927,7 +927,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::DSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -935,7 +935,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::DSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -943,7 +943,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::DSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::DSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -951,7 +951,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::GSSetShader(
ID3D11GeometryShader* pShader, ID3D11GeometryShader* pShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -960,7 +960,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::GSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -968,7 +968,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::GSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -976,7 +976,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::GSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -984,7 +984,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::GSGetShader(
ID3D11GeometryShader** ppGeometryShader, ID3D11GeometryShader** ppGeometryShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -992,7 +992,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::GSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -1000,7 +1000,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::GSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -1008,7 +1008,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::GSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::GSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -1016,7 +1016,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::PSSetShader(
ID3D11PixelShader* pPixelShader, ID3D11PixelShader* pPixelShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -1034,7 +1034,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::PSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -1046,7 +1046,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::PSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -1058,7 +1058,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::PSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -1070,7 +1070,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::PSGetShader(
ID3D11PixelShader** ppPixelShader, ID3D11PixelShader** ppPixelShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -1084,7 +1084,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::PSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -1093,7 +1093,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::PSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -1102,7 +1102,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::PSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::PSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -1111,7 +1111,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSSetShader( void STDMETHODCALLTYPE D3D11DeviceContext::CSSetShader(
ID3D11ComputeShader* pComputeShader, ID3D11ComputeShader* pComputeShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) { UINT NumClassInstances) {
@ -1119,7 +1119,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSSetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::CSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) { ID3D11Buffer* const* ppConstantBuffers) {
@ -1127,7 +1127,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSSetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::CSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) { ID3D11ShaderResourceView* const* ppShaderResourceViews) {
@ -1135,7 +1135,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSSetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::CSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) { ID3D11SamplerState* const* ppSamplers) {
@ -1143,7 +1143,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSSetUnorderedAccessViews( void STDMETHODCALLTYPE D3D11DeviceContext::CSSetUnorderedAccessViews(
UINT StartSlot, UINT StartSlot,
UINT NumUAVs, UINT NumUAVs,
ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews,
@ -1152,7 +1152,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSGetShader( void STDMETHODCALLTYPE D3D11DeviceContext::CSGetShader(
ID3D11ComputeShader** ppComputeShader, ID3D11ComputeShader** ppComputeShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) { UINT* pNumClassInstances) {
@ -1160,7 +1160,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSGetConstantBuffers( void STDMETHODCALLTYPE D3D11DeviceContext::CSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) { ID3D11Buffer** ppConstantBuffers) {
@ -1168,7 +1168,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSGetShaderResources( void STDMETHODCALLTYPE D3D11DeviceContext::CSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) { ID3D11ShaderResourceView** ppShaderResourceViews) {
@ -1176,7 +1176,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSGetSamplers( void STDMETHODCALLTYPE D3D11DeviceContext::CSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) { ID3D11SamplerState** ppSamplers) {
@ -1184,7 +1184,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::CSGetUnorderedAccessViews( void STDMETHODCALLTYPE D3D11DeviceContext::CSGetUnorderedAccessViews(
UINT StartSlot, UINT StartSlot,
UINT NumUAVs, UINT NumUAVs,
ID3D11UnorderedAccessView** ppUnorderedAccessViews) { ID3D11UnorderedAccessView** ppUnorderedAccessViews) {
@ -1192,7 +1192,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMSetRenderTargets( void STDMETHODCALLTYPE D3D11DeviceContext::OMSetRenderTargets(
UINT NumViews, UINT NumViews,
ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11RenderTargetView* const* ppRenderTargetViews,
ID3D11DepthStencilView* pDepthStencilView) { ID3D11DepthStencilView* pDepthStencilView) {
@ -1234,7 +1234,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews( void STDMETHODCALLTYPE D3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews(
UINT NumRTVs, UINT NumRTVs,
ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11RenderTargetView* const* ppRenderTargetViews,
ID3D11DepthStencilView* pDepthStencilView, ID3D11DepthStencilView* pDepthStencilView,
@ -1246,7 +1246,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMSetBlendState( void STDMETHODCALLTYPE D3D11DeviceContext::OMSetBlendState(
ID3D11BlendState* pBlendState, ID3D11BlendState* pBlendState,
const FLOAT BlendFactor[4], const FLOAT BlendFactor[4],
UINT SampleMask) { UINT SampleMask) {
@ -1270,7 +1270,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMSetDepthStencilState( void STDMETHODCALLTYPE D3D11DeviceContext::OMSetDepthStencilState(
ID3D11DepthStencilState* pDepthStencilState, ID3D11DepthStencilState* pDepthStencilState,
UINT StencilRef) { UINT StencilRef) {
auto depthStencilState = static_cast<D3D11DepthStencilState*>(pDepthStencilState); auto depthStencilState = static_cast<D3D11DepthStencilState*>(pDepthStencilState);
@ -1291,7 +1291,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMGetRenderTargets( void STDMETHODCALLTYPE D3D11DeviceContext::OMGetRenderTargets(
UINT NumViews, UINT NumViews,
ID3D11RenderTargetView** ppRenderTargetViews, ID3D11RenderTargetView** ppRenderTargetViews,
ID3D11DepthStencilView** ppDepthStencilView) { ID3D11DepthStencilView** ppDepthStencilView) {
@ -1309,7 +1309,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMGetRenderTargetsAndUnorderedAccessViews( void STDMETHODCALLTYPE D3D11DeviceContext::OMGetRenderTargetsAndUnorderedAccessViews(
UINT NumRTVs, UINT NumRTVs,
ID3D11RenderTargetView** ppRenderTargetViews, ID3D11RenderTargetView** ppRenderTargetViews,
ID3D11DepthStencilView** ppDepthStencilView, ID3D11DepthStencilView** ppDepthStencilView,
@ -1320,7 +1320,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMGetBlendState( void STDMETHODCALLTYPE D3D11DeviceContext::OMGetBlendState(
ID3D11BlendState** ppBlendState, ID3D11BlendState** ppBlendState,
FLOAT BlendFactor[4], FLOAT BlendFactor[4],
UINT* pSampleMask) { UINT* pSampleMask) {
@ -1335,7 +1335,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::OMGetDepthStencilState( void STDMETHODCALLTYPE D3D11DeviceContext::OMGetDepthStencilState(
ID3D11DepthStencilState** ppDepthStencilState, ID3D11DepthStencilState** ppDepthStencilState,
UINT* pStencilRef) { UINT* pStencilRef) {
if (ppDepthStencilState != nullptr) if (ppDepthStencilState != nullptr)
@ -1346,7 +1346,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::RSSetState(ID3D11RasterizerState* pRasterizerState) { void STDMETHODCALLTYPE D3D11DeviceContext::RSSetState(ID3D11RasterizerState* pRasterizerState) {
auto rasterizerState = static_cast<D3D11RasterizerState*>(pRasterizerState); auto rasterizerState = static_cast<D3D11RasterizerState*>(pRasterizerState);
if (m_state.rs.state != rasterizerState) { if (m_state.rs.state != rasterizerState) {
@ -1365,7 +1365,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::RSSetViewports( void STDMETHODCALLTYPE D3D11DeviceContext::RSSetViewports(
UINT NumViewports, UINT NumViewports,
const D3D11_VIEWPORT* pViewports) { const D3D11_VIEWPORT* pViewports) {
m_state.rs.numViewports = NumViewports; m_state.rs.numViewports = NumViewports;
@ -1377,7 +1377,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::RSSetScissorRects( void STDMETHODCALLTYPE D3D11DeviceContext::RSSetScissorRects(
UINT NumRects, UINT NumRects,
const D3D11_RECT* pRects) { const D3D11_RECT* pRects) {
m_state.rs.numScissors = NumRects; m_state.rs.numScissors = NumRects;
@ -1395,13 +1395,13 @@ namespace dxvk {
} }
void D3D11DeviceContext::RSGetState(ID3D11RasterizerState** ppRasterizerState) { void STDMETHODCALLTYPE D3D11DeviceContext::RSGetState(ID3D11RasterizerState** ppRasterizerState) {
if (ppRasterizerState != nullptr) if (ppRasterizerState != nullptr)
*ppRasterizerState = m_state.rs.state.ref(); *ppRasterizerState = m_state.rs.state.ref();
} }
void D3D11DeviceContext::RSGetViewports( void STDMETHODCALLTYPE D3D11DeviceContext::RSGetViewports(
UINT* pNumViewports, UINT* pNumViewports,
D3D11_VIEWPORT* pViewports) { D3D11_VIEWPORT* pViewports) {
if (pViewports != nullptr) { if (pViewports != nullptr) {
@ -1423,7 +1423,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::RSGetScissorRects( void STDMETHODCALLTYPE D3D11DeviceContext::RSGetScissorRects(
UINT* pNumRects, UINT* pNumRects,
D3D11_RECT* pRects) { D3D11_RECT* pRects) {
if (pRects != nullptr) { if (pRects != nullptr) {
@ -1443,7 +1443,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::SOSetTargets( void STDMETHODCALLTYPE D3D11DeviceContext::SOSetTargets(
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppSOTargets, ID3D11Buffer* const* ppSOTargets,
const UINT* pOffsets) { const UINT* pOffsets) {
@ -1451,7 +1451,7 @@ namespace dxvk {
} }
void D3D11DeviceContext::SOGetTargets( void STDMETHODCALLTYPE D3D11DeviceContext::SOGetTargets(
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppSOTargets) { ID3D11Buffer** ppSOTargets) {
Logger::err("D3D11DeviceContext::SOGetTargets: Not implemented"); Logger::err("D3D11DeviceContext::SOGetTargets: Not implemented");

224
src/d3d11/d3d11_context.h
View File

@ -20,62 +20,62 @@ namespace dxvk {
Rc<DxvkDevice> device); Rc<DxvkDevice> device);
~D3D11DeviceContext(); ~D3D11DeviceContext();
ULONG AddRef() final; ULONG STDMETHODCALLTYPE AddRef() final;
ULONG Release() final; ULONG STDMETHODCALLTYPE Release() final;
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice(ID3D11Device **ppDevice) final; void STDMETHODCALLTYPE GetDevice(ID3D11Device **ppDevice) final;
D3D11_DEVICE_CONTEXT_TYPE GetType() final; D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType() final;
UINT GetContextFlags() final; UINT STDMETHODCALLTYPE GetContextFlags() final;
void ClearState() final; void STDMETHODCALLTYPE ClearState() final;
void Flush() final; void STDMETHODCALLTYPE Flush() final;
void ExecuteCommandList( void STDMETHODCALLTYPE ExecuteCommandList(
ID3D11CommandList* pCommandList, ID3D11CommandList* pCommandList,
WINBOOL RestoreContextState) final; WINBOOL RestoreContextState) final;
HRESULT FinishCommandList( HRESULT STDMETHODCALLTYPE FinishCommandList(
WINBOOL RestoreDeferredContextState, WINBOOL RestoreDeferredContextState,
ID3D11CommandList **ppCommandList) final; ID3D11CommandList **ppCommandList) final;
HRESULT Map( HRESULT STDMETHODCALLTYPE Map(
ID3D11Resource* pResource, ID3D11Resource* pResource,
UINT Subresource, UINT Subresource,
D3D11_MAP MapType, D3D11_MAP MapType,
UINT MapFlags, UINT MapFlags,
D3D11_MAPPED_SUBRESOURCE* pMappedResource) final; D3D11_MAPPED_SUBRESOURCE* pMappedResource) final;
void Unmap( void STDMETHODCALLTYPE Unmap(
ID3D11Resource* pResource, ID3D11Resource* pResource,
UINT Subresource) final; UINT Subresource) final;
void Begin(ID3D11Asynchronous *pAsync) final; void STDMETHODCALLTYPE Begin(ID3D11Asynchronous *pAsync) final;
void End(ID3D11Asynchronous *pAsync) final; void STDMETHODCALLTYPE End(ID3D11Asynchronous *pAsync) final;
HRESULT GetData( HRESULT STDMETHODCALLTYPE GetData(
ID3D11Asynchronous* pAsync, ID3D11Asynchronous* pAsync,
void* pData, void* pData,
UINT DataSize, UINT DataSize,
UINT GetDataFlags) final; UINT GetDataFlags) final;
void SetPredication( void STDMETHODCALLTYPE SetPredication(
ID3D11Predicate* pPredicate, ID3D11Predicate* pPredicate,
WINBOOL PredicateValue) final; WINBOOL PredicateValue) final;
void GetPredication( void STDMETHODCALLTYPE GetPredication(
ID3D11Predicate** ppPredicate, ID3D11Predicate** ppPredicate,
WINBOOL* pPredicateValue) final; WINBOOL* pPredicateValue) final;
void CopySubresourceRegion( void STDMETHODCALLTYPE CopySubresourceRegion(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
UINT DstX, UINT DstX,
@ -85,37 +85,37 @@ namespace dxvk {
UINT SrcSubresource, UINT SrcSubresource,
const D3D11_BOX* pSrcBox) final; const D3D11_BOX* pSrcBox) final;
void CopyResource( void STDMETHODCALLTYPE CopyResource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
ID3D11Resource* pSrcResource) final; ID3D11Resource* pSrcResource) final;
void CopyStructureCount( void STDMETHODCALLTYPE CopyStructureCount(
ID3D11Buffer* pDstBuffer, ID3D11Buffer* pDstBuffer,
UINT DstAlignedByteOffset, UINT DstAlignedByteOffset,
ID3D11UnorderedAccessView* pSrcView) final; ID3D11UnorderedAccessView* pSrcView) final;
void ClearRenderTargetView( void STDMETHODCALLTYPE ClearRenderTargetView(
ID3D11RenderTargetView* pRenderTargetView, ID3D11RenderTargetView* pRenderTargetView,
const FLOAT ColorRGBA[4]) final; const FLOAT ColorRGBA[4]) final;
void ClearUnorderedAccessViewUint( void STDMETHODCALLTYPE ClearUnorderedAccessViewUint(
ID3D11UnorderedAccessView* pUnorderedAccessView, ID3D11UnorderedAccessView* pUnorderedAccessView,
const UINT Values[4]) final; const UINT Values[4]) final;
void ClearUnorderedAccessViewFloat( void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat(
ID3D11UnorderedAccessView* pUnorderedAccessView, ID3D11UnorderedAccessView* pUnorderedAccessView,
const FLOAT Values[4]) final; const FLOAT Values[4]) final;
void ClearDepthStencilView( void STDMETHODCALLTYPE ClearDepthStencilView(
ID3D11DepthStencilView* pDepthStencilView, ID3D11DepthStencilView* pDepthStencilView,
UINT ClearFlags, UINT ClearFlags,
FLOAT Depth, FLOAT Depth,
UINT8 Stencil) final; UINT8 Stencil) final;
void GenerateMips( void STDMETHODCALLTYPE GenerateMips(
ID3D11ShaderResourceView* pShaderResourceView) final; ID3D11ShaderResourceView* pShaderResourceView) final;
void UpdateSubresource( void STDMETHODCALLTYPE UpdateSubresource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
const D3D11_BOX* pDstBox, const D3D11_BOX* pDstBox,
@ -123,354 +123,354 @@ namespace dxvk {
UINT SrcRowPitch, UINT SrcRowPitch,
UINT SrcDepthPitch) final; UINT SrcDepthPitch) final;
void SetResourceMinLOD( void STDMETHODCALLTYPE SetResourceMinLOD(
ID3D11Resource* pResource, ID3D11Resource* pResource,
FLOAT MinLOD) final; FLOAT MinLOD) final;
FLOAT GetResourceMinLOD( FLOAT STDMETHODCALLTYPE GetResourceMinLOD(
ID3D11Resource* pResource) final; ID3D11Resource* pResource) final;
void ResolveSubresource( void STDMETHODCALLTYPE ResolveSubresource(
ID3D11Resource* pDstResource, ID3D11Resource* pDstResource,
UINT DstSubresource, UINT DstSubresource,
ID3D11Resource* pSrcResource, ID3D11Resource* pSrcResource,
UINT SrcSubresource, UINT SrcSubresource,
DXGI_FORMAT Format) final; DXGI_FORMAT Format) final;
void DrawAuto() final; void STDMETHODCALLTYPE DrawAuto() final;
void Draw( void STDMETHODCALLTYPE Draw(
UINT VertexCount, UINT VertexCount,
UINT StartVertexLocation) final; UINT StartVertexLocation) final;
void DrawIndexed( void STDMETHODCALLTYPE DrawIndexed(
UINT IndexCount, UINT IndexCount,
UINT StartIndexLocation, UINT StartIndexLocation,
INT BaseVertexLocation) final; INT BaseVertexLocation) final;
void DrawInstanced( void STDMETHODCALLTYPE DrawInstanced(
UINT VertexCountPerInstance, UINT VertexCountPerInstance,
UINT InstanceCount, UINT InstanceCount,
UINT StartVertexLocation, UINT StartVertexLocation,
UINT StartInstanceLocation) final; UINT StartInstanceLocation) final;
void DrawIndexedInstanced( void STDMETHODCALLTYPE DrawIndexedInstanced(
UINT IndexCountPerInstance, UINT IndexCountPerInstance,
UINT InstanceCount, UINT InstanceCount,
UINT StartIndexLocation, UINT StartIndexLocation,
INT BaseVertexLocation, INT BaseVertexLocation,
UINT StartInstanceLocation) final; UINT StartInstanceLocation) final;
void DrawIndexedInstancedIndirect( void STDMETHODCALLTYPE DrawIndexedInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) final; UINT AlignedByteOffsetForArgs) final;
void DrawInstancedIndirect( void STDMETHODCALLTYPE DrawInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) final; UINT AlignedByteOffsetForArgs) final;
void Dispatch( void STDMETHODCALLTYPE Dispatch(
UINT ThreadGroupCountX, UINT ThreadGroupCountX,
UINT ThreadGroupCountY, UINT ThreadGroupCountY,
UINT ThreadGroupCountZ) final; UINT ThreadGroupCountZ) final;
void DispatchIndirect( void STDMETHODCALLTYPE DispatchIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) final; UINT AlignedByteOffsetForArgs) final;
void IASetInputLayout( void STDMETHODCALLTYPE IASetInputLayout(
ID3D11InputLayout* pInputLayout) final; ID3D11InputLayout* pInputLayout) final;
void IASetPrimitiveTopology( void STDMETHODCALLTYPE IASetPrimitiveTopology(
D3D11_PRIMITIVE_TOPOLOGY Topology) final; D3D11_PRIMITIVE_TOPOLOGY Topology) final;
void IASetVertexBuffers( void STDMETHODCALLTYPE IASetVertexBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppVertexBuffers, ID3D11Buffer* const* ppVertexBuffers,
const UINT* pStrides, const UINT* pStrides,
const UINT* pOffsets) final; const UINT* pOffsets) final;
void IASetIndexBuffer( void STDMETHODCALLTYPE IASetIndexBuffer(
ID3D11Buffer* pIndexBuffer, ID3D11Buffer* pIndexBuffer,
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT Offset) final; UINT Offset) final;
void IAGetInputLayout( void STDMETHODCALLTYPE IAGetInputLayout(
ID3D11InputLayout** ppInputLayout) final; ID3D11InputLayout** ppInputLayout) final;
void IAGetPrimitiveTopology( void STDMETHODCALLTYPE IAGetPrimitiveTopology(
D3D11_PRIMITIVE_TOPOLOGY* pTopology) final; D3D11_PRIMITIVE_TOPOLOGY* pTopology) final;
void IAGetVertexBuffers( void STDMETHODCALLTYPE IAGetVertexBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppVertexBuffers, ID3D11Buffer** ppVertexBuffers,
UINT* pStrides, UINT* pStrides,
UINT* pOffsets) final; UINT* pOffsets) final;
void IAGetIndexBuffer( void STDMETHODCALLTYPE IAGetIndexBuffer(
ID3D11Buffer** pIndexBuffer, ID3D11Buffer** pIndexBuffer,
DXGI_FORMAT* Format, DXGI_FORMAT* Format,
UINT* Offset) final; UINT* Offset) final;
void VSSetShader( void STDMETHODCALLTYPE VSSetShader(
ID3D11VertexShader* pVertexShader, ID3D11VertexShader* pVertexShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void VSSetConstantBuffers( void STDMETHODCALLTYPE VSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void VSSetShaderResources( void STDMETHODCALLTYPE VSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void VSSetSamplers( void STDMETHODCALLTYPE VSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void VSGetShader( void STDMETHODCALLTYPE VSGetShader(
ID3D11VertexShader** ppVertexShader, ID3D11VertexShader** ppVertexShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void VSGetConstantBuffers( void STDMETHODCALLTYPE VSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void VSGetShaderResources( void STDMETHODCALLTYPE VSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void VSGetSamplers( void STDMETHODCALLTYPE VSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void HSSetShader( void STDMETHODCALLTYPE HSSetShader(
ID3D11HullShader* pHullShader, ID3D11HullShader* pHullShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void HSSetShaderResources( void STDMETHODCALLTYPE HSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void HSSetConstantBuffers( void STDMETHODCALLTYPE HSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void HSSetSamplers( void STDMETHODCALLTYPE HSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void HSGetShader( void STDMETHODCALLTYPE HSGetShader(
ID3D11HullShader** ppHullShader, ID3D11HullShader** ppHullShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void HSGetConstantBuffers( void STDMETHODCALLTYPE HSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void HSGetShaderResources( void STDMETHODCALLTYPE HSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void HSGetSamplers( void STDMETHODCALLTYPE HSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void DSSetShader( void STDMETHODCALLTYPE DSSetShader(
ID3D11DomainShader* pDomainShader, ID3D11DomainShader* pDomainShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void DSSetShaderResources( void STDMETHODCALLTYPE DSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void DSSetConstantBuffers( void STDMETHODCALLTYPE DSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void DSSetSamplers( void STDMETHODCALLTYPE DSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void DSGetShader( void STDMETHODCALLTYPE DSGetShader(
ID3D11DomainShader** ppDomainShader, ID3D11DomainShader** ppDomainShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void DSGetConstantBuffers( void STDMETHODCALLTYPE DSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void DSGetShaderResources( void STDMETHODCALLTYPE DSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void DSGetSamplers( void STDMETHODCALLTYPE DSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void GSSetShader( void STDMETHODCALLTYPE GSSetShader(
ID3D11GeometryShader* pShader, ID3D11GeometryShader* pShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void GSSetConstantBuffers( void STDMETHODCALLTYPE GSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void GSSetShaderResources( void STDMETHODCALLTYPE GSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void GSSetSamplers( void STDMETHODCALLTYPE GSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void GSGetShader( void STDMETHODCALLTYPE GSGetShader(
ID3D11GeometryShader** ppGeometryShader, ID3D11GeometryShader** ppGeometryShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void GSGetConstantBuffers( void STDMETHODCALLTYPE GSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void GSGetShaderResources( void STDMETHODCALLTYPE GSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void GSGetSamplers( void STDMETHODCALLTYPE GSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void PSSetShader( void STDMETHODCALLTYPE PSSetShader(
ID3D11PixelShader* pPixelShader, ID3D11PixelShader* pPixelShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void PSSetConstantBuffers( void STDMETHODCALLTYPE PSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void PSSetShaderResources( void STDMETHODCALLTYPE PSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void PSSetSamplers( void STDMETHODCALLTYPE PSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void PSGetShader( void STDMETHODCALLTYPE PSGetShader(
ID3D11PixelShader** ppPixelShader, ID3D11PixelShader** ppPixelShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void PSGetConstantBuffers( void STDMETHODCALLTYPE PSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void PSGetShaderResources( void STDMETHODCALLTYPE PSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void PSGetSamplers( void STDMETHODCALLTYPE PSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void CSSetShader( void STDMETHODCALLTYPE CSSetShader(
ID3D11ComputeShader* pComputeShader, ID3D11ComputeShader* pComputeShader,
ID3D11ClassInstance* const* ppClassInstances, ID3D11ClassInstance* const* ppClassInstances,
UINT NumClassInstances) final; UINT NumClassInstances) final;
void CSSetConstantBuffers( void STDMETHODCALLTYPE CSSetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers) final; ID3D11Buffer* const* ppConstantBuffers) final;
void CSSetShaderResources( void STDMETHODCALLTYPE CSSetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView* const* ppShaderResourceViews) final; ID3D11ShaderResourceView* const* ppShaderResourceViews) final;
void CSSetSamplers( void STDMETHODCALLTYPE CSSetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) final; ID3D11SamplerState* const* ppSamplers) final;
void CSSetUnorderedAccessViews( void STDMETHODCALLTYPE CSSetUnorderedAccessViews(
UINT StartSlot, UINT StartSlot,
UINT NumUAVs, UINT NumUAVs,
ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews,
const UINT* pUAVInitialCounts) final; const UINT* pUAVInitialCounts) final;
void CSGetShader( void STDMETHODCALLTYPE CSGetShader(
ID3D11ComputeShader** ppComputeShader, ID3D11ComputeShader** ppComputeShader,
ID3D11ClassInstance** ppClassInstances, ID3D11ClassInstance** ppClassInstances,
UINT* pNumClassInstances) final; UINT* pNumClassInstances) final;
void CSGetConstantBuffers( void STDMETHODCALLTYPE CSGetConstantBuffers(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppConstantBuffers) final; ID3D11Buffer** ppConstantBuffers) final;
void CSGetShaderResources( void STDMETHODCALLTYPE CSGetShaderResources(
UINT StartSlot, UINT StartSlot,
UINT NumViews, UINT NumViews,
ID3D11ShaderResourceView** ppShaderResourceViews) final; ID3D11ShaderResourceView** ppShaderResourceViews) final;
void CSGetSamplers( void STDMETHODCALLTYPE CSGetSamplers(
UINT StartSlot, UINT StartSlot,
UINT NumSamplers, UINT NumSamplers,
ID3D11SamplerState** ppSamplers) final; ID3D11SamplerState** ppSamplers) final;
void CSGetUnorderedAccessViews( void STDMETHODCALLTYPE CSGetUnorderedAccessViews(
UINT StartSlot, UINT StartSlot,
UINT NumUAVs, UINT NumUAVs,
ID3D11UnorderedAccessView** ppUnorderedAccessViews) final; ID3D11UnorderedAccessView** ppUnorderedAccessViews) final;
void OMSetRenderTargets( void STDMETHODCALLTYPE OMSetRenderTargets(
UINT NumViews, UINT NumViews,
ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11RenderTargetView* const* ppRenderTargetViews,
ID3D11DepthStencilView* pDepthStencilView) final; ID3D11DepthStencilView* pDepthStencilView) final;
void OMSetRenderTargetsAndUnorderedAccessViews( void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews(
UINT NumRTVs, UINT NumRTVs,
ID3D11RenderTargetView* const* ppRenderTargetViews, ID3D11RenderTargetView* const* ppRenderTargetViews,
ID3D11DepthStencilView* pDepthStencilView, ID3D11DepthStencilView* pDepthStencilView,
@ -479,21 +479,21 @@ namespace dxvk {
ID3D11UnorderedAccessView* const* ppUnorderedAccessViews, ID3D11UnorderedAccessView* const* ppUnorderedAccessViews,
const UINT* pUAVInitialCounts) final; const UINT* pUAVInitialCounts) final;
void OMSetBlendState( void STDMETHODCALLTYPE OMSetBlendState(
ID3D11BlendState* pBlendState, ID3D11BlendState* pBlendState,
const FLOAT BlendFactor[4], const FLOAT BlendFactor[4],
UINT SampleMask) final; UINT SampleMask) final;
void OMSetDepthStencilState( void STDMETHODCALLTYPE OMSetDepthStencilState(
ID3D11DepthStencilState* pDepthStencilState, ID3D11DepthStencilState* pDepthStencilState,
UINT StencilRef) final; UINT StencilRef) final;
void OMGetRenderTargets( void STDMETHODCALLTYPE OMGetRenderTargets(
UINT NumViews, UINT NumViews,
ID3D11RenderTargetView** ppRenderTargetViews, ID3D11RenderTargetView** ppRenderTargetViews,
ID3D11DepthStencilView** ppDepthStencilView) final; ID3D11DepthStencilView** ppDepthStencilView) final;
void OMGetRenderTargetsAndUnorderedAccessViews( void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews(
UINT NumRTVs, UINT NumRTVs,
ID3D11RenderTargetView** ppRenderTargetViews, ID3D11RenderTargetView** ppRenderTargetViews,
ID3D11DepthStencilView** ppDepthStencilView, ID3D11DepthStencilView** ppDepthStencilView,
@ -501,43 +501,43 @@ namespace dxvk {
UINT NumUAVs, UINT NumUAVs,
ID3D11UnorderedAccessView** ppUnorderedAccessViews) final; ID3D11UnorderedAccessView** ppUnorderedAccessViews) final;
void OMGetBlendState( void STDMETHODCALLTYPE OMGetBlendState(
ID3D11BlendState** ppBlendState, ID3D11BlendState** ppBlendState,
FLOAT BlendFactor[4], FLOAT BlendFactor[4],
UINT* pSampleMask) final; UINT* pSampleMask) final;
void OMGetDepthStencilState( void STDMETHODCALLTYPE OMGetDepthStencilState(
ID3D11DepthStencilState** ppDepthStencilState, ID3D11DepthStencilState** ppDepthStencilState,
UINT* pStencilRef) final; UINT* pStencilRef) final;
void RSSetState( void STDMETHODCALLTYPE RSSetState(
ID3D11RasterizerState* pRasterizerState) final; ID3D11RasterizerState* pRasterizerState) final;
void RSSetViewports( void STDMETHODCALLTYPE RSSetViewports(
UINT NumViewports, UINT NumViewports,
const D3D11_VIEWPORT* pViewports) final; const D3D11_VIEWPORT* pViewports) final;
void RSSetScissorRects( void STDMETHODCALLTYPE RSSetScissorRects(
UINT NumRects, UINT NumRects,
const D3D11_RECT* pRects) final; const D3D11_RECT* pRects) final;
void RSGetState( void STDMETHODCALLTYPE RSGetState(
ID3D11RasterizerState** ppRasterizerState) final; ID3D11RasterizerState** ppRasterizerState) final;
void RSGetViewports( void STDMETHODCALLTYPE RSGetViewports(
UINT* pNumViewports, UINT* pNumViewports,
D3D11_VIEWPORT* pViewports) final; D3D11_VIEWPORT* pViewports) final;
void RSGetScissorRects( void STDMETHODCALLTYPE RSGetScissorRects(
UINT* pNumRects, UINT* pNumRects,
D3D11_RECT* pRects) final; D3D11_RECT* pRects) final;
void SOSetTargets( void STDMETHODCALLTYPE SOSetTargets(
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppSOTargets, ID3D11Buffer* const* ppSOTargets,
const UINT* pOffsets) final; const UINT* pOffsets) final;
void SOGetTargets( void STDMETHODCALLTYPE SOGetTargets(
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer** ppSOTargets) final; ID3D11Buffer** ppSOTargets) final;

6
src/d3d11/d3d11_depth_stencil.cpp
View File

@ -27,7 +27,7 @@ namespace dxvk {
} }
HRESULT D3D11DepthStencilState::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11DepthStencilState::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DepthStencilState); COM_QUERY_IFACE(riid, ppvObject, ID3D11DepthStencilState);
@ -37,12 +37,12 @@ namespace dxvk {
} }
void D3D11DepthStencilState::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11DepthStencilState::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = ref(m_device); *ppDevice = ref(m_device);
} }
void D3D11DepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc) { void STDMETHODCALLTYPE D3D11DepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

6
src/d3d11/d3d11_depth_stencil.h
View File

@ -20,14 +20,14 @@ namespace dxvk {
const D3D11_DEPTH_STENCIL_DESC& desc); const D3D11_DEPTH_STENCIL_DESC& desc);
~D3D11DepthStencilState(); ~D3D11DepthStencilState();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_DEPTH_STENCIL_DESC* pDesc) final; D3D11_DEPTH_STENCIL_DESC* pDesc) final;
void BindToContext( void BindToContext(

84
src/d3d11/d3d11_device.cpp
View File

@ -45,7 +45,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11Device::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11Device); COM_QUERY_IFACE(riid, ppvObject, ID3D11Device);
@ -63,7 +63,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateBuffer( HRESULT STDMETHODCALLTYPE D3D11Device::CreateBuffer(
const D3D11_BUFFER_DESC* pDesc, const D3D11_BUFFER_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Buffer** ppBuffer) { ID3D11Buffer** ppBuffer) {
@ -153,7 +153,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateTexture1D( HRESULT STDMETHODCALLTYPE D3D11Device::CreateTexture1D(
const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_TEXTURE1D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture1D** ppTexture1D) { ID3D11Texture1D** ppTexture1D) {
@ -162,7 +162,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateTexture2D( HRESULT STDMETHODCALLTYPE D3D11Device::CreateTexture2D(
const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_TEXTURE2D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture2D** ppTexture2D) { ID3D11Texture2D** ppTexture2D) {
@ -255,7 +255,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateTexture3D( HRESULT STDMETHODCALLTYPE D3D11Device::CreateTexture3D(
const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_TEXTURE3D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture3D** ppTexture3D) { ID3D11Texture3D** ppTexture3D) {
@ -264,7 +264,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateShaderResourceView( HRESULT STDMETHODCALLTYPE D3D11Device::CreateShaderResourceView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc,
ID3D11ShaderResourceView** ppSRView) { ID3D11ShaderResourceView** ppSRView) {
@ -399,7 +399,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateUnorderedAccessView( HRESULT STDMETHODCALLTYPE D3D11Device::CreateUnorderedAccessView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc,
ID3D11UnorderedAccessView** ppUAView) { ID3D11UnorderedAccessView** ppUAView) {
@ -408,7 +408,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateRenderTargetView( HRESULT STDMETHODCALLTYPE D3D11Device::CreateRenderTargetView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
ID3D11RenderTargetView** ppRTView) { ID3D11RenderTargetView** ppRTView) {
@ -503,7 +503,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateDepthStencilView( HRESULT STDMETHODCALLTYPE D3D11Device::CreateDepthStencilView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc,
ID3D11DepthStencilView** ppDepthStencilView) { ID3D11DepthStencilView** ppDepthStencilView) {
@ -598,7 +598,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateInputLayout( HRESULT STDMETHODCALLTYPE D3D11Device::CreateInputLayout(
const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs,
UINT NumElements, UINT NumElements,
const void* pShaderBytecodeWithInputSignature, const void* pShaderBytecodeWithInputSignature,
@ -645,7 +645,7 @@ namespace dxvk {
// Create vertex input binding description. The // Create vertex input binding description. The
// stride is dynamic state in D3D11 and will be // stride is dynamic state in D3D11 and will be
// set by D3D11DeviceContext::IASetVertexBuffers. // set by STDMETHODCALLTYPE D3D11DeviceContext::IASetVertexBuffers.
DxvkVertexBinding binding; DxvkVertexBinding binding;
binding.binding = pInputElementDescs[i].InputSlot; binding.binding = pInputElementDescs[i].InputSlot;
binding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX; binding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
@ -700,7 +700,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateVertexShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreateVertexShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -720,7 +720,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateGeometryShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreateGeometryShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -730,7 +730,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateGeometryShaderWithStreamOutput( HRESULT STDMETHODCALLTYPE D3D11Device::CreateGeometryShaderWithStreamOutput(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration,
@ -745,7 +745,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreatePixelShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreatePixelShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -765,7 +765,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateHullShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreateHullShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -775,7 +775,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateDomainShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreateDomainShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -785,7 +785,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateComputeShader( HRESULT STDMETHODCALLTYPE D3D11Device::CreateComputeShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
@ -795,13 +795,13 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateClassLinkage(ID3D11ClassLinkage** ppLinkage) { HRESULT STDMETHODCALLTYPE D3D11Device::CreateClassLinkage(ID3D11ClassLinkage** ppLinkage) {
*ppLinkage = ref(new D3D11ClassLinkage(this)); *ppLinkage = ref(new D3D11ClassLinkage(this));
return S_OK; return S_OK;
} }
HRESULT D3D11Device::CreateBlendState( HRESULT STDMETHODCALLTYPE D3D11Device::CreateBlendState(
const D3D11_BLEND_DESC* pBlendStateDesc, const D3D11_BLEND_DESC* pBlendStateDesc,
ID3D11BlendState** ppBlendState) { ID3D11BlendState** ppBlendState) {
D3D11_BLEND_DESC desc; D3D11_BLEND_DESC desc;
@ -833,7 +833,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateDepthStencilState( HRESULT STDMETHODCALLTYPE D3D11Device::CreateDepthStencilState(
const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc,
ID3D11DepthStencilState** ppDepthStencilState) { ID3D11DepthStencilState** ppDepthStencilState) {
D3D11_DEPTH_STENCIL_DESC desc; D3D11_DEPTH_STENCIL_DESC desc;
@ -863,7 +863,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateRasterizerState( HRESULT STDMETHODCALLTYPE D3D11Device::CreateRasterizerState(
const D3D11_RASTERIZER_DESC* pRasterizerDesc, const D3D11_RASTERIZER_DESC* pRasterizerDesc,
ID3D11RasterizerState** ppRasterizerState) { ID3D11RasterizerState** ppRasterizerState) {
D3D11_RASTERIZER_DESC desc; D3D11_RASTERIZER_DESC desc;
@ -889,7 +889,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateSamplerState( HRESULT STDMETHODCALLTYPE D3D11Device::CreateSamplerState(
const D3D11_SAMPLER_DESC* pSamplerDesc, const D3D11_SAMPLER_DESC* pSamplerDesc,
ID3D11SamplerState** ppSamplerState) { ID3D11SamplerState** ppSamplerState) {
DxvkSamplerCreateInfo info; DxvkSamplerCreateInfo info;
@ -943,7 +943,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateQuery( HRESULT STDMETHODCALLTYPE D3D11Device::CreateQuery(
const D3D11_QUERY_DESC* pQueryDesc, const D3D11_QUERY_DESC* pQueryDesc,
ID3D11Query** ppQuery) { ID3D11Query** ppQuery) {
Logger::err("D3D11Device::CreateQuery: Not implemented"); Logger::err("D3D11Device::CreateQuery: Not implemented");
@ -951,7 +951,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreatePredicate( HRESULT STDMETHODCALLTYPE D3D11Device::CreatePredicate(
const D3D11_QUERY_DESC* pPredicateDesc, const D3D11_QUERY_DESC* pPredicateDesc,
ID3D11Predicate** ppPredicate) { ID3D11Predicate** ppPredicate) {
Logger::err("D3D11Device::CreatePredicate: Not implemented"); Logger::err("D3D11Device::CreatePredicate: Not implemented");
@ -959,7 +959,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateCounter( HRESULT STDMETHODCALLTYPE D3D11Device::CreateCounter(
const D3D11_COUNTER_DESC* pCounterDesc, const D3D11_COUNTER_DESC* pCounterDesc,
ID3D11Counter** ppCounter) { ID3D11Counter** ppCounter) {
Logger::err("D3D11Device::CreateCounter: Not implemented"); Logger::err("D3D11Device::CreateCounter: Not implemented");
@ -967,7 +967,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CreateDeferredContext( HRESULT STDMETHODCALLTYPE D3D11Device::CreateDeferredContext(
UINT ContextFlags, UINT ContextFlags,
ID3D11DeviceContext** ppDeferredContext) { ID3D11DeviceContext** ppDeferredContext) {
Logger::err("D3D11Device::CreateDeferredContext: Not implemented"); Logger::err("D3D11Device::CreateDeferredContext: Not implemented");
@ -975,7 +975,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::OpenSharedResource( HRESULT STDMETHODCALLTYPE D3D11Device::OpenSharedResource(
HANDLE hResource, HANDLE hResource,
REFIID ReturnedInterface, REFIID ReturnedInterface,
void** ppResource) { void** ppResource) {
@ -984,7 +984,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CheckFormatSupport( HRESULT STDMETHODCALLTYPE D3D11Device::CheckFormatSupport(
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT* pFormatSupport) { UINT* pFormatSupport) {
Logger::err("D3D11Device::CheckFormatSupport: Not implemented"); Logger::err("D3D11Device::CheckFormatSupport: Not implemented");
@ -992,7 +992,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CheckMultisampleQualityLevels( HRESULT STDMETHODCALLTYPE D3D11Device::CheckMultisampleQualityLevels(
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT SampleCount, UINT SampleCount,
UINT* pNumQualityLevels) { UINT* pNumQualityLevels) {
@ -1030,12 +1030,12 @@ namespace dxvk {
} }
void D3D11Device::CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo) { void STDMETHODCALLTYPE D3D11Device::CheckCounterInfo(D3D11_COUNTER_INFO* pCounterInfo) {
Logger::err("D3D11Device::CheckCounterInfo: Not implemented"); Logger::err("D3D11Device::CheckCounterInfo: Not implemented");
} }
HRESULT D3D11Device::CheckCounter( HRESULT STDMETHODCALLTYPE D3D11Device::CheckCounter(
const D3D11_COUNTER_DESC* pDesc, const D3D11_COUNTER_DESC* pDesc,
D3D11_COUNTER_TYPE* pType, D3D11_COUNTER_TYPE* pType,
UINT* pActiveCounters, UINT* pActiveCounters,
@ -1050,7 +1050,7 @@ namespace dxvk {
} }
HRESULT D3D11Device::CheckFeatureSupport( HRESULT STDMETHODCALLTYPE D3D11Device::CheckFeatureSupport(
D3D11_FEATURE Feature, D3D11_FEATURE Feature,
void* pFeatureSupportData, void* pFeatureSupportData,
UINT FeatureSupportDataSize) { UINT FeatureSupportDataSize) {
@ -1059,52 +1059,52 @@ namespace dxvk {
} }
HRESULT D3D11Device::GetPrivateData( HRESULT STDMETHODCALLTYPE D3D11Device::GetPrivateData(
REFGUID guid, UINT* pDataSize, void* pData) { REFGUID guid, UINT* pDataSize, void* pData) {
return m_dxgiDevice->GetPrivateData(guid, pDataSize, pData); return m_dxgiDevice->GetPrivateData(guid, pDataSize, pData);
} }
HRESULT D3D11Device::SetPrivateData( HRESULT STDMETHODCALLTYPE D3D11Device::SetPrivateData(
REFGUID guid, UINT DataSize, const void* pData) { REFGUID guid, UINT DataSize, const void* pData) {
return m_dxgiDevice->SetPrivateData(guid, DataSize, pData); return m_dxgiDevice->SetPrivateData(guid, DataSize, pData);
} }
HRESULT D3D11Device::SetPrivateDataInterface( HRESULT STDMETHODCALLTYPE D3D11Device::SetPrivateDataInterface(
REFGUID guid, const IUnknown* pData) { REFGUID guid, const IUnknown* pData) {
return m_dxgiDevice->SetPrivateDataInterface(guid, pData); return m_dxgiDevice->SetPrivateDataInterface(guid, pData);
} }
D3D_FEATURE_LEVEL D3D11Device::GetFeatureLevel() { D3D_FEATURE_LEVEL STDMETHODCALLTYPE D3D11Device::GetFeatureLevel() {
return m_featureLevel; return m_featureLevel;
} }
UINT D3D11Device::GetCreationFlags() { UINT STDMETHODCALLTYPE D3D11Device::GetCreationFlags() {
return m_featureFlags; return m_featureFlags;
} }
HRESULT D3D11Device::GetDeviceRemovedReason() { HRESULT STDMETHODCALLTYPE D3D11Device::GetDeviceRemovedReason() {
Logger::err("D3D11Device::GetDeviceRemovedReason: Not implemented"); Logger::err("D3D11Device::GetDeviceRemovedReason: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
void D3D11Device::GetImmediateContext(ID3D11DeviceContext** ppImmediateContext) { void STDMETHODCALLTYPE D3D11Device::GetImmediateContext(ID3D11DeviceContext** ppImmediateContext) {
*ppImmediateContext = ref(m_context); *ppImmediateContext = ref(m_context);
} }
HRESULT D3D11Device::SetExceptionMode(UINT RaiseFlags) { HRESULT STDMETHODCALLTYPE D3D11Device::SetExceptionMode(UINT RaiseFlags) {
Logger::err("D3D11Device::SetExceptionMode: Not implemented"); Logger::err("D3D11Device::SetExceptionMode: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
UINT D3D11Device::GetExceptionMode() { UINT STDMETHODCALLTYPE D3D11Device::GetExceptionMode() {
Logger::err("D3D11Device::GetExceptionMode: Not implemented"); Logger::err("D3D11Device::GetExceptionMode: Not implemented");
return 0; return 0;
} }

86
src/d3d11/d3d11_device.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <dxgi_object.h> #include "../dxgi/dxgi_object.h"
#include <dxgi_resource.h> #include "../dxgi/dxgi_resource.h"
#include "d3d11_interfaces.h" #include "d3d11_interfaces.h"
#include "d3d11_state.h" #include "d3d11_state.h"
@ -25,70 +25,70 @@ namespace dxvk {
UINT featureFlags); UINT featureFlags);
~D3D11Device(); ~D3D11Device();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
HRESULT CreateBuffer( HRESULT STDMETHODCALLTYPE CreateBuffer(
const D3D11_BUFFER_DESC* pDesc, const D3D11_BUFFER_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Buffer** ppBuffer) final; ID3D11Buffer** ppBuffer) final;
HRESULT CreateTexture1D( HRESULT STDMETHODCALLTYPE CreateTexture1D(
const D3D11_TEXTURE1D_DESC* pDesc, const D3D11_TEXTURE1D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture1D** ppTexture1D) final; ID3D11Texture1D** ppTexture1D) final;
HRESULT CreateTexture2D( HRESULT STDMETHODCALLTYPE CreateTexture2D(
const D3D11_TEXTURE2D_DESC* pDesc, const D3D11_TEXTURE2D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture2D** ppTexture2D) final; ID3D11Texture2D** ppTexture2D) final;
HRESULT CreateTexture3D( HRESULT STDMETHODCALLTYPE CreateTexture3D(
const D3D11_TEXTURE3D_DESC* pDesc, const D3D11_TEXTURE3D_DESC* pDesc,
const D3D11_SUBRESOURCE_DATA* pInitialData, const D3D11_SUBRESOURCE_DATA* pInitialData,
ID3D11Texture3D** ppTexture3D) final; ID3D11Texture3D** ppTexture3D) final;
HRESULT CreateShaderResourceView( HRESULT STDMETHODCALLTYPE CreateShaderResourceView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc, const D3D11_SHADER_RESOURCE_VIEW_DESC* pDesc,
ID3D11ShaderResourceView** ppSRView) final; ID3D11ShaderResourceView** ppSRView) final;
HRESULT CreateUnorderedAccessView( HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc, const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc,
ID3D11UnorderedAccessView** ppUAView) final; ID3D11UnorderedAccessView** ppUAView) final;
HRESULT CreateRenderTargetView( HRESULT STDMETHODCALLTYPE CreateRenderTargetView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_RENDER_TARGET_VIEW_DESC* pDesc, const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
ID3D11RenderTargetView** ppRTView) final; ID3D11RenderTargetView** ppRTView) final;
HRESULT CreateDepthStencilView( HRESULT STDMETHODCALLTYPE CreateDepthStencilView(
ID3D11Resource* pResource, ID3D11Resource* pResource,
const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc, const D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc,
ID3D11DepthStencilView** ppDepthStencilView) final; ID3D11DepthStencilView** ppDepthStencilView) final;
HRESULT CreateInputLayout( HRESULT STDMETHODCALLTYPE CreateInputLayout(
const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs, const D3D11_INPUT_ELEMENT_DESC* pInputElementDescs,
UINT NumElements, UINT NumElements,
const void* pShaderBytecodeWithInputSignature, const void* pShaderBytecodeWithInputSignature,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11InputLayout** ppInputLayout) final; ID3D11InputLayout** ppInputLayout) final;
HRESULT CreateVertexShader( HRESULT STDMETHODCALLTYPE CreateVertexShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11VertexShader** ppVertexShader) final; ID3D11VertexShader** ppVertexShader) final;
HRESULT CreateGeometryShader( HRESULT STDMETHODCALLTYPE CreateGeometryShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11GeometryShader** ppGeometryShader) final; ID3D11GeometryShader** ppGeometryShader) final;
HRESULT CreateGeometryShaderWithStreamOutput( HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
const D3D11_SO_DECLARATION_ENTRY* pSODeclaration, const D3D11_SO_DECLARATION_ENTRY* pSODeclaration,
@ -99,83 +99,83 @@ namespace dxvk {
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11GeometryShader** ppGeometryShader) final; ID3D11GeometryShader** ppGeometryShader) final;
HRESULT CreatePixelShader( HRESULT STDMETHODCALLTYPE CreatePixelShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11PixelShader** ppPixelShader) final; ID3D11PixelShader** ppPixelShader) final;
HRESULT CreateHullShader( HRESULT STDMETHODCALLTYPE CreateHullShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11HullShader** ppHullShader) final; ID3D11HullShader** ppHullShader) final;
HRESULT CreateDomainShader( HRESULT STDMETHODCALLTYPE CreateDomainShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11DomainShader** ppDomainShader) final; ID3D11DomainShader** ppDomainShader) final;
HRESULT CreateComputeShader( HRESULT STDMETHODCALLTYPE CreateComputeShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11ComputeShader** ppComputeShader) final; ID3D11ComputeShader** ppComputeShader) final;
HRESULT CreateClassLinkage( HRESULT STDMETHODCALLTYPE CreateClassLinkage(
ID3D11ClassLinkage** ppLinkage) final; ID3D11ClassLinkage** ppLinkage) final;
HRESULT CreateBlendState( HRESULT STDMETHODCALLTYPE CreateBlendState(
const D3D11_BLEND_DESC* pBlendStateDesc, const D3D11_BLEND_DESC* pBlendStateDesc,
ID3D11BlendState** ppBlendState) final; ID3D11BlendState** ppBlendState) final;
HRESULT CreateDepthStencilState( HRESULT STDMETHODCALLTYPE CreateDepthStencilState(
const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc,
ID3D11DepthStencilState** ppDepthStencilState) final; ID3D11DepthStencilState** ppDepthStencilState) final;
HRESULT CreateRasterizerState( HRESULT STDMETHODCALLTYPE CreateRasterizerState(
const D3D11_RASTERIZER_DESC* pRasterizerDesc, const D3D11_RASTERIZER_DESC* pRasterizerDesc,
ID3D11RasterizerState** ppRasterizerState) final; ID3D11RasterizerState** ppRasterizerState) final;
HRESULT CreateSamplerState( HRESULT STDMETHODCALLTYPE CreateSamplerState(
const D3D11_SAMPLER_DESC* pSamplerDesc, const D3D11_SAMPLER_DESC* pSamplerDesc,
ID3D11SamplerState** ppSamplerState) final; ID3D11SamplerState** ppSamplerState) final;
HRESULT CreateQuery( HRESULT STDMETHODCALLTYPE CreateQuery(
const D3D11_QUERY_DESC* pQueryDesc, const D3D11_QUERY_DESC* pQueryDesc,
ID3D11Query** ppQuery) final; ID3D11Query** ppQuery) final;
HRESULT CreatePredicate( HRESULT STDMETHODCALLTYPE CreatePredicate(
const D3D11_QUERY_DESC* pPredicateDesc, const D3D11_QUERY_DESC* pPredicateDesc,
ID3D11Predicate** ppPredicate) final; ID3D11Predicate** ppPredicate) final;
HRESULT CreateCounter( HRESULT STDMETHODCALLTYPE CreateCounter(
const D3D11_COUNTER_DESC* pCounterDesc, const D3D11_COUNTER_DESC* pCounterDesc,
ID3D11Counter** ppCounter) final; ID3D11Counter** ppCounter) final;
HRESULT CreateDeferredContext( HRESULT STDMETHODCALLTYPE CreateDeferredContext(
UINT ContextFlags, UINT ContextFlags,
ID3D11DeviceContext** ppDeferredContext) final; ID3D11DeviceContext** ppDeferredContext) final;
HRESULT OpenSharedResource( HRESULT STDMETHODCALLTYPE OpenSharedResource(
HANDLE hResource, HANDLE hResource,
REFIID ReturnedInterface, REFIID ReturnedInterface,
void** ppResource) final; void** ppResource) final;
HRESULT CheckFormatSupport( HRESULT STDMETHODCALLTYPE CheckFormatSupport(
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT* pFormatSupport) final; UINT* pFormatSupport) final;
HRESULT CheckMultisampleQualityLevels( HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(
DXGI_FORMAT Format, DXGI_FORMAT Format,
UINT SampleCount, UINT SampleCount,
UINT* pNumQualityLevels) final; UINT* pNumQualityLevels) final;
void CheckCounterInfo( void STDMETHODCALLTYPE CheckCounterInfo(
D3D11_COUNTER_INFO* pCounterInfo) final; D3D11_COUNTER_INFO* pCounterInfo) final;
HRESULT CheckCounter( HRESULT STDMETHODCALLTYPE CheckCounter(
const D3D11_COUNTER_DESC* pDesc, const D3D11_COUNTER_DESC* pDesc,
D3D11_COUNTER_TYPE* pType, D3D11_COUNTER_TYPE* pType,
UINT* pActiveCounters, UINT* pActiveCounters,
@ -186,37 +186,37 @@ namespace dxvk {
LPSTR szDescription, LPSTR szDescription,
UINT* pDescriptionLength) final; UINT* pDescriptionLength) final;
HRESULT CheckFeatureSupport( HRESULT STDMETHODCALLTYPE CheckFeatureSupport(
D3D11_FEATURE Feature, D3D11_FEATURE Feature,
void* pFeatureSupportData, void* pFeatureSupportData,
UINT FeatureSupportDataSize) final; UINT FeatureSupportDataSize) final;
HRESULT GetPrivateData( HRESULT STDMETHODCALLTYPE GetPrivateData(
REFGUID Name, REFGUID Name,
UINT *pDataSize, UINT *pDataSize,
void *pData) final; void *pData) final;
HRESULT SetPrivateData( HRESULT STDMETHODCALLTYPE SetPrivateData(
REFGUID Name, REFGUID Name,
UINT DataSize, UINT DataSize,
const void *pData) final; const void *pData) final;
HRESULT SetPrivateDataInterface( HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
REFGUID Name, REFGUID Name,
const IUnknown *pUnknown) final; const IUnknown *pUnknown) final;
D3D_FEATURE_LEVEL GetFeatureLevel() final; D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel() final;
UINT GetCreationFlags() final; UINT STDMETHODCALLTYPE GetCreationFlags() final;
HRESULT GetDeviceRemovedReason() final; HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason() final;
void GetImmediateContext( void STDMETHODCALLTYPE GetImmediateContext(
ID3D11DeviceContext** ppImmediateContext) final; ID3D11DeviceContext** ppImmediateContext) final;
HRESULT SetExceptionMode(UINT RaiseFlags) final; HRESULT STDMETHODCALLTYPE SetExceptionMode(UINT RaiseFlags) final;
UINT GetExceptionMode() final; UINT STDMETHODCALLTYPE GetExceptionMode() final;
Rc<DxvkDevice> GetDXVKDevice() { Rc<DxvkDevice> GetDXVKDevice() {
return m_dxvkDevice; return m_dxvkDevice;

6
src/d3d11/d3d11_device_child.h
View File

@ -11,7 +11,7 @@ namespace dxvk {
public: public:
HRESULT GetPrivateData( HRESULT STDMETHODCALLTYPE GetPrivateData(
REFGUID guid, REFGUID guid,
UINT *pDataSize, UINT *pDataSize,
void *pData) final { void *pData) final {
@ -19,7 +19,7 @@ namespace dxvk {
guid, pDataSize, pData); guid, pDataSize, pData);
} }
HRESULT SetPrivateData( HRESULT STDMETHODCALLTYPE SetPrivateData(
REFGUID guid, REFGUID guid,
UINT DataSize, UINT DataSize,
const void *pData) final { const void *pData) final {
@ -27,7 +27,7 @@ namespace dxvk {
guid, DataSize, pData); guid, DataSize, pData);
} }
HRESULT SetPrivateDataInterface( HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
REFGUID guid, REFGUID guid,
const IUnknown *pUnknown) final { const IUnknown *pUnknown) final {
return m_privateData.setInterface( return m_privateData.setInterface(

4
src/d3d11/d3d11_input_layout.cpp
View File

@ -26,7 +26,7 @@ namespace dxvk {
} }
HRESULT D3D11InputLayout::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11InputLayout::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11InputLayout); COM_QUERY_IFACE(riid, ppvObject, ID3D11InputLayout);
@ -36,7 +36,7 @@ namespace dxvk {
} }
void D3D11InputLayout::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11InputLayout::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }

4
src/d3d11/d3d11_input_layout.h
View File

@ -19,11 +19,11 @@ namespace dxvk {
~D3D11InputLayout(); ~D3D11InputLayout();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void BindToContext( void BindToContext(

4
src/d3d11/d3d11_main.cpp
View File

@ -1,7 +1,7 @@
#include <array> #include <array>
#include <dxgi_adapter.h> #include "../dxgi/dxgi_adapter.h"
#include <dxgi_device.h> #include "../dxgi/dxgi_device.h"
#include "d3d11_device.h" #include "d3d11_device.h"
#include "d3d11_enums.h" #include "d3d11_enums.h"

8
src/d3d11/d3d11_present.cpp
View File

@ -8,7 +8,7 @@ namespace dxvk {
D3D11PresentDevice::~D3D11PresentDevice() { } D3D11PresentDevice::~D3D11PresentDevice() { }
HRESULT D3D11PresentDevice::QueryInterface( HRESULT STDMETHODCALLTYPE D3D11PresentDevice::QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) { void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
@ -17,7 +17,7 @@ namespace dxvk {
} }
HRESULT D3D11PresentDevice::WrapSwapChainBackBuffer( HRESULT STDMETHODCALLTYPE D3D11PresentDevice::WrapSwapChainBackBuffer(
IDXGIImageResourcePrivate* pResource, IDXGIImageResourcePrivate* pResource,
const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc, const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
IUnknown** ppInterface) { IUnknown** ppInterface) {
@ -40,7 +40,7 @@ namespace dxvk {
} }
HRESULT D3D11PresentDevice::FlushRenderingCommands() { HRESULT STDMETHODCALLTYPE D3D11PresentDevice::FlushRenderingCommands() {
Com<ID3D11DeviceContext> deviceContext = nullptr; Com<ID3D11DeviceContext> deviceContext = nullptr;
m_device->GetImmediateContext(&deviceContext); m_device->GetImmediateContext(&deviceContext);
@ -49,7 +49,7 @@ namespace dxvk {
} }
HRESULT D3D11PresentDevice::GetDevice(REFGUID riid, void** ppvDevice) { HRESULT STDMETHODCALLTYPE D3D11PresentDevice::GetDevice(REFGUID riid, void** ppvDevice) {
return m_device->QueryInterface(riid, ppvDevice); return m_device->QueryInterface(riid, ppvDevice);
} }

15
src/d3d11/d3d11_present.h
View File

@ -1,12 +1,11 @@
#pragma once #pragma once
#include <dxgi_device.h> #include "../dxgi/dxgi_device.h"
#include "d3d11_include.h"
#include "../dxgi/dxgi_interfaces.h" #include "../dxgi/dxgi_interfaces.h"
#include "../dxgi/dxgi_resource.h" #include "../dxgi/dxgi_resource.h"
#include "d3d11_include.h"
namespace dxvk { namespace dxvk {
class D3D11Device; class D3D11Device;
@ -18,18 +17,18 @@ namespace dxvk {
D3D11PresentDevice(); D3D11PresentDevice();
~D3D11PresentDevice(); ~D3D11PresentDevice();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
HRESULT WrapSwapChainBackBuffer( HRESULT STDMETHODCALLTYPE WrapSwapChainBackBuffer(
IDXGIImageResourcePrivate* pResource, IDXGIImageResourcePrivate* pResource,
const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc, const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
IUnknown** ppInterface) final; IUnknown** ppInterface) final;
HRESULT FlushRenderingCommands() final; HRESULT STDMETHODCALLTYPE FlushRenderingCommands() final;
HRESULT GetDevice( HRESULT STDMETHODCALLTYPE GetDevice(
REFGUID riid, REFGUID riid,
void** ppvDevice) final; void** ppvDevice) final;

6
src/d3d11/d3d11_rasterizer.cpp
View File

@ -67,7 +67,7 @@ namespace dxvk {
} }
HRESULT D3D11RasterizerState::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11RasterizerState::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11RasterizerState); COM_QUERY_IFACE(riid, ppvObject, ID3D11RasterizerState);
@ -77,12 +77,12 @@ namespace dxvk {
} }
void D3D11RasterizerState::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11RasterizerState::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = ref(m_device); *ppDevice = ref(m_device);
} }
void D3D11RasterizerState::GetDesc(D3D11_RASTERIZER_DESC* pDesc) { void STDMETHODCALLTYPE D3D11RasterizerState::GetDesc(D3D11_RASTERIZER_DESC* pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

6
src/d3d11/d3d11_rasterizer.h
View File

@ -19,14 +19,14 @@ namespace dxvk {
const D3D11_RASTERIZER_DESC& desc); const D3D11_RASTERIZER_DESC& desc);
~D3D11RasterizerState(); ~D3D11RasterizerState();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_RASTERIZER_DESC* pDesc) final; D3D11_RASTERIZER_DESC* pDesc) final;
void BindToContext( void BindToContext(

6
src/d3d11/d3d11_sampler.cpp
View File

@ -19,7 +19,7 @@ namespace dxvk {
} }
HRESULT D3D11SamplerState::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11SamplerState::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11SamplerState); COM_QUERY_IFACE(riid, ppvObject, ID3D11SamplerState);
@ -29,12 +29,12 @@ namespace dxvk {
} }
void D3D11SamplerState::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11SamplerState::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
void D3D11SamplerState::GetDesc(D3D11_SAMPLER_DESC* pDesc) { void STDMETHODCALLTYPE D3D11SamplerState::GetDesc(D3D11_SAMPLER_DESC* pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

6
src/d3d11/d3d11_sampler.h
View File

@ -18,14 +18,14 @@ namespace dxvk {
const Rc<DxvkSampler>& sampler); const Rc<DxvkSampler>& sampler);
~D3D11SamplerState(); ~D3D11SamplerState();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_SAMPLER_DESC* pDesc) final; D3D11_SAMPLER_DESC* pDesc) final;
Rc<DxvkSampler> GetDXVKSampler() const { Rc<DxvkSampler> GetDXVKSampler() const {

6
src/d3d11/d3d11_shader.h
View File

@ -66,7 +66,7 @@ namespace dxvk {
~D3D11Shader() { } ~D3D11Shader() { }
HRESULT QueryInterface(REFIID riid, void** ppvObject) final { HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) final {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, Base); COM_QUERY_IFACE(riid, ppvObject, Base);
@ -75,11 +75,11 @@ namespace dxvk {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
void GetDevice(ID3D11Device **ppDevice) final { void STDMETHODCALLTYPE GetDevice(ID3D11Device **ppDevice) final {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
Rc<DxvkShader> GetShader() const { Rc<DxvkShader> STDMETHODCALLTYPE GetShader() const {
return m_module.GetShader(); return m_module.GetShader();
} }

12
src/d3d11/d3d11_texture.cpp
View File

@ -19,7 +19,7 @@ namespace dxvk {
} }
HRESULT D3D11Texture2D::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D11Texture2D::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11Resource); COM_QUERY_IFACE(riid, ppvObject, ID3D11Resource);
@ -34,29 +34,29 @@ namespace dxvk {
} }
void D3D11Texture2D::GetDevice(ID3D11Device** ppDevice) { void STDMETHODCALLTYPE D3D11Texture2D::GetDevice(ID3D11Device** ppDevice) {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
void D3D11Texture2D::GetType(D3D11_RESOURCE_DIMENSION *pResourceDimension) { void STDMETHODCALLTYPE D3D11Texture2D::GetType(D3D11_RESOURCE_DIMENSION *pResourceDimension) {
*pResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D; *pResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
} }
UINT D3D11Texture2D::GetEvictionPriority() { UINT STDMETHODCALLTYPE D3D11Texture2D::GetEvictionPriority() {
UINT EvictionPriority = DXGI_RESOURCE_PRIORITY_NORMAL; UINT EvictionPriority = DXGI_RESOURCE_PRIORITY_NORMAL;
m_resource->GetEvictionPriority(&EvictionPriority); m_resource->GetEvictionPriority(&EvictionPriority);
return EvictionPriority; return EvictionPriority;
} }
void D3D11Texture2D::SetEvictionPriority(UINT EvictionPriority) { void STDMETHODCALLTYPE D3D11Texture2D::SetEvictionPriority(UINT EvictionPriority) {
m_resource->SetEvictionPriority(EvictionPriority); m_resource->SetEvictionPriority(EvictionPriority);
} }
void D3D11Texture2D::GetDesc(D3D11_TEXTURE2D_DESC *pDesc) { void STDMETHODCALLTYPE D3D11Texture2D::GetDesc(D3D11_TEXTURE2D_DESC *pDesc) {
*pDesc = m_desc; *pDesc = m_desc;
} }

12
src/d3d11/d3d11_texture.h
View File

@ -20,21 +20,21 @@ namespace dxvk {
const D3D11_TEXTURE2D_DESC& desc); const D3D11_TEXTURE2D_DESC& desc);
~D3D11Texture2D(); ~D3D11Texture2D();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
void GetDevice( void STDMETHODCALLTYPE GetDevice(
ID3D11Device **ppDevice) final; ID3D11Device **ppDevice) final;
void GetType( void STDMETHODCALLTYPE GetType(
D3D11_RESOURCE_DIMENSION *pResourceDimension) final; D3D11_RESOURCE_DIMENSION *pResourceDimension) final;
UINT GetEvictionPriority() final; UINT STDMETHODCALLTYPE GetEvictionPriority() final;
void SetEvictionPriority(UINT EvictionPriority) final; void STDMETHODCALLTYPE SetEvictionPriority(UINT EvictionPriority) final;
void GetDesc( void STDMETHODCALLTYPE GetDesc(
D3D11_TEXTURE2D_DESC *pDesc) final; D3D11_TEXTURE2D_DESC *pDesc) final;
Rc<DxvkImage> GetDXVKImage(); Rc<DxvkImage> GetDXVKImage();

8
src/d3d11/d3d11_view.h
View File

@ -31,7 +31,7 @@ namespace dxvk {
: m_device(device), m_resource(resource), m_desc(desc), : m_device(device), m_resource(resource), m_desc(desc),
m_bufferView(bufferView), m_imageView(imageView) { } m_bufferView(bufferView), m_imageView(imageView) { }
HRESULT QueryInterface(REFIID riid, void** ppvObject) final { HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) final {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild); COM_QUERY_IFACE(riid, ppvObject, ID3D11DeviceChild);
COM_QUERY_IFACE(riid, ppvObject, ID3D11View); COM_QUERY_IFACE(riid, ppvObject, ID3D11View);
@ -41,15 +41,15 @@ namespace dxvk {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
void GetDevice(ID3D11Device** ppDevice) final { void STDMETHODCALLTYPE GetDevice(ID3D11Device** ppDevice) final {
*ppDevice = m_device.ref(); *ppDevice = m_device.ref();
} }
void GetResource(ID3D11Resource** ppResource) final { void STDMETHODCALLTYPE GetResource(ID3D11Resource** ppResource) final {
*ppResource = m_resource.ref(); *ppResource = m_resource.ref();
} }
void GetDesc(DescType* pDesc) final { void STDMETHODCALLTYPE GetDesc(DescType* pDesc) final {
*pDesc = m_desc; *pDesc = m_desc;
} }

16
src/dxgi/dxgi_adapter.cpp
View File

@ -24,7 +24,7 @@ namespace dxvk {
} }
HRESULT DxgiAdapter::QueryInterface( HRESULT STDMETHODCALLTYPE DxgiAdapter::QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) { void **ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
@ -38,14 +38,14 @@ namespace dxvk {
} }
HRESULT DxgiAdapter::GetParent( HRESULT STDMETHODCALLTYPE DxgiAdapter::GetParent(
REFIID riid, REFIID riid,
void **ppParent) { void **ppParent) {
return m_factory->QueryInterface(riid, ppParent); return m_factory->QueryInterface(riid, ppParent);
} }
HRESULT DxgiAdapter::CheckInterfaceSupport( HRESULT STDMETHODCALLTYPE DxgiAdapter::CheckInterfaceSupport(
REFGUID InterfaceName, REFGUID InterfaceName,
LARGE_INTEGER *pUMDVersion) { LARGE_INTEGER *pUMDVersion) {
Logger::err("DxgiAdapter::CheckInterfaceSupport: No D3D10 support"); Logger::err("DxgiAdapter::CheckInterfaceSupport: No D3D10 support");
@ -53,7 +53,7 @@ namespace dxvk {
} }
HRESULT DxgiAdapter::EnumOutputs( HRESULT STDMETHODCALLTYPE DxgiAdapter::EnumOutputs(
UINT Output, UINT Output,
IDXGIOutput **ppOutput) { IDXGIOutput **ppOutput) {
if (ppOutput == nullptr) if (ppOutput == nullptr)
@ -74,7 +74,7 @@ namespace dxvk {
} }
HRESULT DxgiAdapter::GetDesc(DXGI_ADAPTER_DESC* pDesc) { HRESULT STDMETHODCALLTYPE DxgiAdapter::GetDesc(DXGI_ADAPTER_DESC* pDesc) {
DXGI_ADAPTER_DESC1 desc1; DXGI_ADAPTER_DESC1 desc1;
HRESULT hr = this->GetDesc1(&desc1); HRESULT hr = this->GetDesc1(&desc1);
@ -98,7 +98,7 @@ namespace dxvk {
} }
HRESULT DxgiAdapter::GetDesc1(DXGI_ADAPTER_DESC1* pDesc) { HRESULT STDMETHODCALLTYPE DxgiAdapter::GetDesc1(DXGI_ADAPTER_DESC1* pDesc) {
if (pDesc == nullptr) if (pDesc == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -133,12 +133,12 @@ namespace dxvk {
} }
Rc<DxvkAdapter> DxgiAdapter::GetDXVKAdapter() { Rc<DxvkAdapter> STDMETHODCALLTYPE DxgiAdapter::GetDXVKAdapter() {
return m_adapter; return m_adapter;
} }
DxgiFormatPair DxgiAdapter::LookupFormat(DXGI_FORMAT format) { DxgiFormatPair STDMETHODCALLTYPE DxgiAdapter::LookupFormat(DXGI_FORMAT format) {
auto pair = m_formats.find(format); auto pair = m_formats.find(format);
return pair != m_formats.end() return pair != m_formats.end()

16
src/dxgi/dxgi_adapter.h
View File

@ -24,31 +24,31 @@ namespace dxvk {
const Rc<DxvkAdapter>& adapter); const Rc<DxvkAdapter>& adapter);
~DxgiAdapter(); ~DxgiAdapter();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) final; void **ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void **ppParent) final; void **ppParent) final;
HRESULT CheckInterfaceSupport( HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(
REFGUID InterfaceName, REFGUID InterfaceName,
LARGE_INTEGER *pUMDVersion) final; LARGE_INTEGER *pUMDVersion) final;
HRESULT EnumOutputs( HRESULT STDMETHODCALLTYPE EnumOutputs(
UINT Output, UINT Output,
IDXGIOutput **ppOutput) final; IDXGIOutput **ppOutput) final;
HRESULT GetDesc( HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_ADAPTER_DESC *pDesc) final; DXGI_ADAPTER_DESC *pDesc) final;
HRESULT GetDesc1( HRESULT STDMETHODCALLTYPE GetDesc1(
DXGI_ADAPTER_DESC1 *pDesc) final; DXGI_ADAPTER_DESC1 *pDesc) final;
Rc<DxvkAdapter> GetDXVKAdapter() final; Rc<DxvkAdapter> STDMETHODCALLTYPE GetDXVKAdapter() final;
DxgiFormatPair LookupFormat( DxgiFormatPair STDMETHODCALLTYPE LookupFormat(
DXGI_FORMAT format) final; DXGI_FORMAT format) final;
private: private:

22
src/dxgi/dxgi_device.cpp
View File

@ -16,7 +16,7 @@ namespace dxvk {
} }
HRESULT DxgiDevice::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE DxgiDevice::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, IDXGIObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIObject);
COM_QUERY_IFACE(riid, ppvObject, IDXGIDevice); COM_QUERY_IFACE(riid, ppvObject, IDXGIDevice);
@ -31,12 +31,12 @@ namespace dxvk {
} }
HRESULT DxgiDevice::GetParent(REFIID riid, void** ppParent) { HRESULT STDMETHODCALLTYPE DxgiDevice::GetParent(REFIID riid, void** ppParent) {
return m_adapter->QueryInterface(riid, ppParent); return m_adapter->QueryInterface(riid, ppParent);
} }
HRESULT DxgiDevice::CreateSurface( HRESULT STDMETHODCALLTYPE DxgiDevice::CreateSurface(
const DXGI_SURFACE_DESC* pDesc, const DXGI_SURFACE_DESC* pDesc,
UINT NumSurfaces, UINT NumSurfaces,
DXGI_USAGE Usage, DXGI_USAGE Usage,
@ -47,21 +47,21 @@ namespace dxvk {
} }
HRESULT DxgiDevice::GetAdapter( HRESULT STDMETHODCALLTYPE DxgiDevice::GetAdapter(
IDXGIAdapter** pAdapter) { IDXGIAdapter** pAdapter) {
*pAdapter = static_cast<IDXGIAdapter*>(m_adapter.ref()); *pAdapter = static_cast<IDXGIAdapter*>(m_adapter.ref());
return S_OK; return S_OK;
} }
HRESULT DxgiDevice::GetGPUThreadPriority( HRESULT STDMETHODCALLTYPE DxgiDevice::GetGPUThreadPriority(
INT* pPriority) { INT* pPriority) {
*pPriority = 0; *pPriority = 0;
return S_OK; return S_OK;
} }
HRESULT DxgiDevice::QueryResourceResidency( HRESULT STDMETHODCALLTYPE DxgiDevice::QueryResourceResidency(
IUnknown* const* ppResources, IUnknown* const* ppResources,
DXGI_RESIDENCY* pResidencyStatus, DXGI_RESIDENCY* pResidencyStatus,
UINT NumResources) { UINT NumResources) {
@ -70,7 +70,7 @@ namespace dxvk {
} }
HRESULT DxgiDevice::SetGPUThreadPriority( HRESULT STDMETHODCALLTYPE DxgiDevice::SetGPUThreadPriority(
INT Priority) { INT Priority) {
if (Priority < -7 || Priority > 7) if (Priority < -7 || Priority > 7)
return E_INVALIDARG; return E_INVALIDARG;
@ -80,7 +80,7 @@ namespace dxvk {
} }
HRESULT DxgiDevice::GetMaximumFrameLatency( HRESULT STDMETHODCALLTYPE DxgiDevice::GetMaximumFrameLatency(
UINT* pMaxLatency) { UINT* pMaxLatency) {
Logger::warn("DxgiDevice::GetMaximumFrameLatency: Stub"); Logger::warn("DxgiDevice::GetMaximumFrameLatency: Stub");
*pMaxLatency = 1; *pMaxLatency = 1;
@ -88,19 +88,19 @@ namespace dxvk {
} }
HRESULT DxgiDevice::SetMaximumFrameLatency( HRESULT STDMETHODCALLTYPE DxgiDevice::SetMaximumFrameLatency(
UINT MaxLatency) { UINT MaxLatency) {
Logger::warn("DxgiDevice::SetMaximumFrameLatency: Stub"); Logger::warn("DxgiDevice::SetMaximumFrameLatency: Stub");
return S_OK; return S_OK;
} }
void DxgiDevice::SetDeviceLayer(IUnknown* layer) { void STDMETHODCALLTYPE DxgiDevice::SetDeviceLayer(IUnknown* layer) {
m_layer = layer; m_layer = layer;
} }
Rc<DxvkDevice> DxgiDevice::GetDXVKDevice() { Rc<DxvkDevice> STDMETHODCALLTYPE DxgiDevice::GetDXVKDevice() {
return m_device; return m_device;
} }

22
src/dxgi/dxgi_device.h
View File

@ -18,45 +18,45 @@ namespace dxvk {
const VkPhysicalDeviceFeatures* features); const VkPhysicalDeviceFeatures* features);
~DxgiDevice(); ~DxgiDevice();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) final; void **ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void **ppParent) final; void **ppParent) final;
HRESULT CreateSurface( HRESULT STDMETHODCALLTYPE CreateSurface(
const DXGI_SURFACE_DESC* pDesc, const DXGI_SURFACE_DESC* pDesc,
UINT NumSurfaces, UINT NumSurfaces,
DXGI_USAGE Usage, DXGI_USAGE Usage,
const DXGI_SHARED_RESOURCE* pSharedResource, const DXGI_SHARED_RESOURCE* pSharedResource,
IDXGISurface** ppSurface) final; IDXGISurface** ppSurface) final;
HRESULT GetAdapter( HRESULT STDMETHODCALLTYPE GetAdapter(
IDXGIAdapter** pAdapter) final; IDXGIAdapter** pAdapter) final;
HRESULT GetGPUThreadPriority( HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(
INT* pPriority) final; INT* pPriority) final;
HRESULT QueryResourceResidency( HRESULT STDMETHODCALLTYPE QueryResourceResidency(
IUnknown* const* ppResources, IUnknown* const* ppResources,
DXGI_RESIDENCY* pResidencyStatus, DXGI_RESIDENCY* pResidencyStatus,
UINT NumResources) final; UINT NumResources) final;
HRESULT SetGPUThreadPriority( HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(
INT Priority) final; INT Priority) final;
HRESULT GetMaximumFrameLatency( HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(
UINT* pMaxLatency) final; UINT* pMaxLatency) final;
HRESULT SetMaximumFrameLatency( HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(
UINT MaxLatency) final; UINT MaxLatency) final;
void SetDeviceLayer( void STDMETHODCALLTYPE SetDeviceLayer(
IUnknown* layer) final; IUnknown* layer) final;
Rc<DxvkDevice> GetDXVKDevice() final; Rc<DxvkDevice> STDMETHODCALLTYPE GetDXVKDevice() final;
private: private:

18
src/dxgi/dxgi_factory.cpp
View File

@ -15,7 +15,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::QueryInterface( HRESULT STDMETHODCALLTYPE DxgiFactory::QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) { void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
@ -28,7 +28,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::GetParent( HRESULT STDMETHODCALLTYPE DxgiFactory::GetParent(
REFIID riid, REFIID riid,
void** ppParent) { void** ppParent) {
Logger::warn("DxgiFactory::GetParent: Unknown interface query"); Logger::warn("DxgiFactory::GetParent: Unknown interface query");
@ -36,7 +36,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::CreateSoftwareAdapter( HRESULT STDMETHODCALLTYPE DxgiFactory::CreateSoftwareAdapter(
HMODULE Module, HMODULE Module,
IDXGIAdapter** ppAdapter) { IDXGIAdapter** ppAdapter) {
Logger::err("DxgiFactory::CreateSoftwareAdapter: Software adapters not supported"); Logger::err("DxgiFactory::CreateSoftwareAdapter: Software adapters not supported");
@ -44,7 +44,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::CreateSwapChain( HRESULT STDMETHODCALLTYPE DxgiFactory::CreateSwapChain(
IUnknown* pDevice, IUnknown* pDevice,
DXGI_SWAP_CHAIN_DESC* pDesc, DXGI_SWAP_CHAIN_DESC* pDesc,
IDXGISwapChain** ppSwapChain) { IDXGISwapChain** ppSwapChain) {
@ -61,7 +61,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::EnumAdapters( HRESULT STDMETHODCALLTYPE DxgiFactory::EnumAdapters(
UINT Adapter, UINT Adapter,
IDXGIAdapter** ppAdapter) { IDXGIAdapter** ppAdapter) {
if (ppAdapter == nullptr) if (ppAdapter == nullptr)
@ -75,7 +75,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::EnumAdapters1( HRESULT STDMETHODCALLTYPE DxgiFactory::EnumAdapters1(
UINT Adapter, UINT Adapter,
IDXGIAdapter1** ppAdapter) { IDXGIAdapter1** ppAdapter) {
if (ppAdapter == nullptr) if (ppAdapter == nullptr)
@ -90,7 +90,7 @@ namespace dxvk {
} }
HRESULT DxgiFactory::GetWindowAssociation(HWND *pWindowHandle) { HRESULT STDMETHODCALLTYPE DxgiFactory::GetWindowAssociation(HWND *pWindowHandle) {
if (pWindowHandle == nullptr) if (pWindowHandle == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -99,14 +99,14 @@ namespace dxvk {
} }
HRESULT DxgiFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags) { HRESULT STDMETHODCALLTYPE DxgiFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags) {
Logger::warn("DxgiFactory::MakeWindowAssociation: Ignoring flags"); Logger::warn("DxgiFactory::MakeWindowAssociation: Ignoring flags");
m_associatedWindow = WindowHandle; m_associatedWindow = WindowHandle;
return S_OK; return S_OK;
} }
BOOL DxgiFactory::IsCurrent() { BOOL STDMETHODCALLTYPE DxgiFactory::IsCurrent() {
Logger::warn("DxgiFactory::IsCurrent: Stub"); Logger::warn("DxgiFactory::IsCurrent: Stub");
return TRUE; return TRUE;
} }

18
src/dxgi/dxgi_factory.h
View File

@ -15,39 +15,39 @@ namespace dxvk {
DxgiFactory(); DxgiFactory();
~DxgiFactory(); ~DxgiFactory();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void** ppParent) final; void** ppParent) final;
HRESULT CreateSoftwareAdapter( HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(
HMODULE Module, HMODULE Module,
IDXGIAdapter** ppAdapter) final; IDXGIAdapter** ppAdapter) final;
HRESULT CreateSwapChain( HRESULT STDMETHODCALLTYPE CreateSwapChain(
IUnknown* pDevice, IUnknown* pDevice,
DXGI_SWAP_CHAIN_DESC* pDesc, DXGI_SWAP_CHAIN_DESC* pDesc,
IDXGISwapChain** ppSwapChain) final; IDXGISwapChain** ppSwapChain) final;
HRESULT EnumAdapters( HRESULT STDMETHODCALLTYPE EnumAdapters(
UINT Adapter, UINT Adapter,
IDXGIAdapter** ppAdapter) final; IDXGIAdapter** ppAdapter) final;
HRESULT EnumAdapters1( HRESULT STDMETHODCALLTYPE EnumAdapters1(
UINT Adapter, UINT Adapter,
IDXGIAdapter1** ppAdapter) final; IDXGIAdapter1** ppAdapter) final;
HRESULT GetWindowAssociation( HRESULT STDMETHODCALLTYPE GetWindowAssociation(
HWND *pWindowHandle) final; HWND *pWindowHandle) final;
HRESULT MakeWindowAssociation( HRESULT STDMETHODCALLTYPE MakeWindowAssociation(
HWND WindowHandle, HWND WindowHandle,
UINT Flags) final; UINT Flags) final;
BOOL IsCurrent(); BOOL STDMETHODCALLTYPE IsCurrent();
private: private:

22
src/dxgi/dxgi_interfaces.h
View File

@ -37,9 +37,9 @@ MIDL_INTERFACE("907bf281-ea3c-43b4-a8e4-9f231107b4ff")
IDXGIAdapterPrivate : public IDXGIAdapter1 { IDXGIAdapterPrivate : public IDXGIAdapter1 {
static const GUID guid; static const GUID guid;
virtual dxvk::Rc<dxvk::DxvkAdapter> GetDXVKAdapter() = 0; virtual dxvk::Rc<dxvk::DxvkAdapter> STDMETHODCALLTYPE GetDXVKAdapter() = 0;
virtual dxvk::DxgiFormatPair LookupFormat( virtual dxvk::DxgiFormatPair STDMETHODCALLTYPE LookupFormat(
DXGI_FORMAT format) = 0; DXGI_FORMAT format) = 0;
}; };
@ -55,10 +55,10 @@ MIDL_INTERFACE("7a622cf6-627a-46b2-b52f-360ef3da831c")
IDXGIDevicePrivate : public IDXGIDevice1 { IDXGIDevicePrivate : public IDXGIDevice1 {
static const GUID guid; static const GUID guid;
virtual void SetDeviceLayer( virtual void STDMETHODCALLTYPE SetDeviceLayer(
IUnknown* layer) = 0; IUnknown* layer) = 0;
virtual dxvk::Rc<dxvk::DxvkDevice> GetDXVKDevice() = 0; virtual dxvk::Rc<dxvk::DxvkDevice> STDMETHODCALLTYPE GetDXVKDevice() = 0;
}; };
@ -70,9 +70,9 @@ MIDL_INTERFACE("5679becd-8547-4d93-96a1-e61a1ce7ef37")
IDXGIBufferResourcePrivate : public IDXGIResource { IDXGIBufferResourcePrivate : public IDXGIResource {
static const GUID guid; static const GUID guid;
virtual dxvk::Rc<dxvk::DxvkBuffer> GetDXVKBuffer() = 0; virtual dxvk::Rc<dxvk::DxvkBuffer> STDMETHODCALLTYPE GetDXVKBuffer() = 0;
virtual void SetResourceLayer( virtual void STDMETHODCALLTYPE SetResourceLayer(
IUnknown* pLayer) = 0; IUnknown* pLayer) = 0;
}; };
@ -85,9 +85,9 @@ MIDL_INTERFACE("1cfe6592-7de0-4a07-8dcb-4543cbbc6a7d")
IDXGIImageResourcePrivate : public IDXGIResource { IDXGIImageResourcePrivate : public IDXGIResource {
static const GUID guid; static const GUID guid;
virtual dxvk::Rc<dxvk::DxvkImage> GetDXVKImage() = 0; virtual dxvk::Rc<dxvk::DxvkImage> STDMETHODCALLTYPE GetDXVKImage() = 0;
virtual void SetResourceLayer( virtual void STDMETHODCALLTYPE SetResourceLayer(
IUnknown* pLayer) = 0; IUnknown* pLayer) = 0;
}; };
@ -114,7 +114,7 @@ IDXGIPresentDevicePrivate : public IUnknown {
* \param [in] ppInterface Target interface * \param [in] ppInterface Target interface
* \returns \c S_OK on success * \returns \c S_OK on success
*/ */
virtual HRESULT WrapSwapChainBackBuffer( virtual HRESULT STDMETHODCALLTYPE WrapSwapChainBackBuffer(
IDXGIImageResourcePrivate* pResource, IDXGIImageResourcePrivate* pResource,
const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc, const DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
IUnknown** ppInterface) = 0; IUnknown** ppInterface) = 0;
@ -127,7 +127,7 @@ IDXGIPresentDevicePrivate : public IUnknown {
* before presenting the swap chain's back buffer. * before presenting the swap chain's back buffer.
* \returns \c S_OK on success * \returns \c S_OK on success
*/ */
virtual HRESULT FlushRenderingCommands() = 0; virtual HRESULT STDMETHODCALLTYPE FlushRenderingCommands() = 0;
/** /**
* \brief Underlying DXVK device * \brief Underlying DXVK device
@ -136,7 +136,7 @@ IDXGIPresentDevicePrivate : public IUnknown {
* \param [in] ppDevice device * \param [in] ppDevice device
* \returns DXVK device handle * \returns DXVK device handle
*/ */
virtual HRESULT GetDevice( virtual HRESULT STDMETHODCALLTYPE GetDevice(
REFGUID riid, REFGUID riid,
void** ppDevice) = 0; void** ppDevice) = 0;
}; };

6
src/dxgi/dxgi_object.h
View File

@ -11,7 +11,7 @@ namespace dxvk {
public: public:
HRESULT GetPrivateData( HRESULT STDMETHODCALLTYPE GetPrivateData(
REFGUID Name, REFGUID Name,
UINT *pDataSize, UINT *pDataSize,
void *pData) final { void *pData) final {
@ -19,7 +19,7 @@ namespace dxvk {
Name, pDataSize, pData); Name, pDataSize, pData);
} }
HRESULT SetPrivateData( HRESULT STDMETHODCALLTYPE SetPrivateData(
REFGUID Name, REFGUID Name,
UINT DataSize, UINT DataSize,
const void *pData) final { const void *pData) final {
@ -27,7 +27,7 @@ namespace dxvk {
Name, DataSize, pData); Name, DataSize, pData);
} }
HRESULT SetPrivateDataInterface( HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
REFGUID Name, REFGUID Name,
const IUnknown *pUnknown) final { const IUnknown *pUnknown) final {
return m_privateData.setInterface( return m_privateData.setInterface(

28
src/dxgi/dxgi_output.cpp
View File

@ -23,7 +23,7 @@ namespace dxvk {
} }
HRESULT DxgiOutput::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE DxgiOutput::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, IDXGIObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIObject);
COM_QUERY_IFACE(riid, ppvObject, IDXGIOutput); COM_QUERY_IFACE(riid, ppvObject, IDXGIOutput);
@ -33,14 +33,14 @@ namespace dxvk {
} }
HRESULT DxgiOutput::GetParent( HRESULT STDMETHODCALLTYPE DxgiOutput::GetParent(
REFIID riid, REFIID riid,
void **ppParent) { void **ppParent) {
return m_adapter->QueryInterface(riid, ppParent); return m_adapter->QueryInterface(riid, ppParent);
} }
HRESULT DxgiOutput::FindClosestMatchingMode( HRESULT STDMETHODCALLTYPE DxgiOutput::FindClosestMatchingMode(
const DXGI_MODE_DESC *pModeToMatch, const DXGI_MODE_DESC *pModeToMatch,
DXGI_MODE_DESC *pClosestMatch, DXGI_MODE_DESC *pClosestMatch,
IUnknown *pConcernedDevice) { IUnknown *pConcernedDevice) {
@ -49,7 +49,7 @@ namespace dxvk {
} }
HRESULT DxgiOutput::GetDesc(DXGI_OUTPUT_DESC *pDesc) { HRESULT STDMETHODCALLTYPE DxgiOutput::GetDesc(DXGI_OUTPUT_DESC *pDesc) {
if (pDesc == nullptr) if (pDesc == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -85,7 +85,7 @@ namespace dxvk {
} }
HRESULT DxgiOutput::GetDisplayModeList( HRESULT STDMETHODCALLTYPE DxgiOutput::GetDisplayModeList(
DXGI_FORMAT EnumFormat, DXGI_FORMAT EnumFormat,
UINT Flags, UINT Flags,
UINT *pNumModes, UINT *pNumModes,
@ -185,48 +185,48 @@ namespace dxvk {
} }
HRESULT DxgiOutput::GetDisplaySurfaceData(IDXGISurface *pDestination) { HRESULT STDMETHODCALLTYPE DxgiOutput::GetDisplaySurfaceData(IDXGISurface *pDestination) {
Logger::err("DxgiOutput::GetDisplaySurfaceData: Not implemented"); Logger::err("DxgiOutput::GetDisplaySurfaceData: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DxgiOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS *pStats) { HRESULT STDMETHODCALLTYPE DxgiOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS *pStats) {
Logger::err("DxgiOutput::GetFrameStatistics: Not implemented"); Logger::err("DxgiOutput::GetFrameStatistics: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DxgiOutput::GetGammaControl(DXGI_GAMMA_CONTROL *pArray) { HRESULT STDMETHODCALLTYPE DxgiOutput::GetGammaControl(DXGI_GAMMA_CONTROL *pArray) {
Logger::err("DxgiOutput::GetGammaControl: Not implemented"); Logger::err("DxgiOutput::GetGammaControl: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DxgiOutput::GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) { HRESULT STDMETHODCALLTYPE DxgiOutput::GetGammaControlCapabilities(DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) {
Logger::err("DxgiOutput::GetGammaControlCapabilities: Not implemented"); Logger::err("DxgiOutput::GetGammaControlCapabilities: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
void DxgiOutput::ReleaseOwnership() { void STDMETHODCALLTYPE DxgiOutput::ReleaseOwnership() {
Logger::warn("DxgiOutput::ReleaseOwnership: Stub"); Logger::warn("DxgiOutput::ReleaseOwnership: Stub");
} }
HRESULT DxgiOutput::SetDisplaySurface(IDXGISurface *pScanoutSurface) { HRESULT STDMETHODCALLTYPE DxgiOutput::SetDisplaySurface(IDXGISurface *pScanoutSurface) {
Logger::err("DxgiOutput::SetDisplaySurface: Not implemented"); Logger::err("DxgiOutput::SetDisplaySurface: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DxgiOutput::SetGammaControl(const DXGI_GAMMA_CONTROL *pArray) { HRESULT STDMETHODCALLTYPE DxgiOutput::SetGammaControl(const DXGI_GAMMA_CONTROL *pArray) {
Logger::err("DxgiOutput::SetGammaControl: Not implemented"); Logger::err("DxgiOutput::SetGammaControl: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DxgiOutput::TakeOwnership( HRESULT STDMETHODCALLTYPE DxgiOutput::TakeOwnership(
IUnknown *pDevice, IUnknown *pDevice,
BOOL Exclusive) { BOOL Exclusive) {
Logger::warn("DxgiOutput::TakeOwnership: Stub"); Logger::warn("DxgiOutput::TakeOwnership: Stub");
@ -234,7 +234,7 @@ namespace dxvk {
} }
HRESULT DxgiOutput::WaitForVBlank() { HRESULT STDMETHODCALLTYPE DxgiOutput::WaitForVBlank() {
Logger::warn("DxgiOutput::WaitForVBlank: Stub"); Logger::warn("DxgiOutput::WaitForVBlank: Stub");
return S_OK; return S_OK;
} }

28
src/dxgi/dxgi_output.h
View File

@ -16,53 +16,53 @@ namespace dxvk {
~DxgiOutput(); ~DxgiOutput();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) final; void **ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void **ppParent) final; void **ppParent) final;
HRESULT FindClosestMatchingMode( HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(
const DXGI_MODE_DESC *pModeToMatch, const DXGI_MODE_DESC *pModeToMatch,
DXGI_MODE_DESC *pClosestMatch, DXGI_MODE_DESC *pClosestMatch,
IUnknown *pConcernedDevice) final; IUnknown *pConcernedDevice) final;
HRESULT GetDesc( HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_OUTPUT_DESC *pDesc) final; DXGI_OUTPUT_DESC *pDesc) final;
HRESULT GetDisplayModeList( HRESULT STDMETHODCALLTYPE GetDisplayModeList(
DXGI_FORMAT EnumFormat, DXGI_FORMAT EnumFormat,
UINT Flags, UINT Flags,
UINT *pNumModes, UINT *pNumModes,
DXGI_MODE_DESC *pDesc) final; DXGI_MODE_DESC *pDesc) final;
HRESULT GetDisplaySurfaceData( HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(
IDXGISurface *pDestination) final; IDXGISurface *pDestination) final;
HRESULT GetFrameStatistics( HRESULT STDMETHODCALLTYPE GetFrameStatistics(
DXGI_FRAME_STATISTICS *pStats) final; DXGI_FRAME_STATISTICS *pStats) final;
HRESULT GetGammaControl( HRESULT STDMETHODCALLTYPE GetGammaControl(
DXGI_GAMMA_CONTROL *pArray) final; DXGI_GAMMA_CONTROL *pArray) final;
HRESULT GetGammaControlCapabilities( HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(
DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) final; DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) final;
void ReleaseOwnership() final; void STDMETHODCALLTYPE ReleaseOwnership() final;
HRESULT SetDisplaySurface( HRESULT STDMETHODCALLTYPE SetDisplaySurface(
IDXGISurface *pScanoutSurface) final; IDXGISurface *pScanoutSurface) final;
HRESULT SetGammaControl( HRESULT STDMETHODCALLTYPE SetGammaControl(
const DXGI_GAMMA_CONTROL *pArray) final; const DXGI_GAMMA_CONTROL *pArray) final;
HRESULT TakeOwnership( HRESULT STDMETHODCALLTYPE TakeOwnership(
IUnknown *pDevice, IUnknown *pDevice,
BOOL Exclusive) final; BOOL Exclusive) final;
HRESULT WaitForVBlank() final; HRESULT STDMETHODCALLTYPE WaitForVBlank() final;
private: private:

16
src/dxgi/dxgi_resource.cpp
View File

@ -27,7 +27,7 @@ namespace dxvk {
} }
HRESULT DxgiImageResource::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE DxgiImageResource::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, IDXGIObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIObject);
COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject);
@ -42,18 +42,18 @@ namespace dxvk {
} }
HRESULT DxgiImageResource::GetParent(REFIID riid, void** ppParent) { HRESULT STDMETHODCALLTYPE DxgiImageResource::GetParent(REFIID riid, void** ppParent) {
Logger::err("DxgiImageResource::GetParent: Unknown interface query"); Logger::err("DxgiImageResource::GetParent: Unknown interface query");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
Rc<DxvkImage> DxgiImageResource::GetDXVKImage() { Rc<DxvkImage> STDMETHODCALLTYPE DxgiImageResource::GetDXVKImage() {
return m_image; return m_image;
} }
void DxgiImageResource::SetResourceLayer(IUnknown* pLayer) { void STDMETHODCALLTYPE DxgiImageResource::SetResourceLayer(IUnknown* pLayer) {
m_layer = pLayer; m_layer = pLayer;
} }
@ -76,7 +76,7 @@ namespace dxvk {
} }
HRESULT DxgiBufferResource::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE DxgiBufferResource::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, IDXGIObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIObject);
COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject);
@ -91,18 +91,18 @@ namespace dxvk {
} }
HRESULT DxgiBufferResource::GetParent(REFIID riid, void** ppParent) { HRESULT STDMETHODCALLTYPE DxgiBufferResource::GetParent(REFIID riid, void** ppParent) {
Logger::err("DxgiBufferResource::GetParent: Unknown interface query"); Logger::err("DxgiBufferResource::GetParent: Unknown interface query");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
Rc<DxvkBuffer> DxgiBufferResource::GetDXVKBuffer() { Rc<DxvkBuffer> STDMETHODCALLTYPE DxgiBufferResource::GetDXVKBuffer() {
return m_buffer; return m_buffer;
} }
void DxgiBufferResource::SetResourceLayer(IUnknown* pLayer) { void STDMETHODCALLTYPE DxgiBufferResource::SetResourceLayer(IUnknown* pLayer) {
m_layer = pLayer; m_layer = pLayer;
} }

18
src/dxgi/dxgi_resource.h
View File

@ -18,7 +18,7 @@ namespace dxvk {
: m_device (pDevice), : m_device (pDevice),
m_usageFlags(usage) { } m_usageFlags(usage) { }
HRESULT GetDevice(REFIID riid, void** ppDevice) { HRESULT STDMETHODCALLTYPE GetDevice(REFIID riid, void** ppDevice) {
return m_device->QueryInterface(riid, ppDevice); return m_device->QueryInterface(riid, ppDevice);
} }
@ -81,17 +81,17 @@ namespace dxvk {
~DxgiImageResource(); ~DxgiImageResource();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) final; void **ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void **ppParent) final; void **ppParent) final;
Rc<DxvkImage> GetDXVKImage() final; Rc<DxvkImage> STDMETHODCALLTYPE GetDXVKImage() final;
void SetResourceLayer( void STDMETHODCALLTYPE SetResourceLayer(
IUnknown* pLayer) final; IUnknown* pLayer) final;
private: private:
@ -120,17 +120,17 @@ namespace dxvk {
~DxgiBufferResource(); ~DxgiBufferResource();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void **ppvObject) final; void **ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void **ppParent) final; void **ppParent) final;
Rc<DxvkBuffer> GetDXVKBuffer() final; Rc<DxvkBuffer> STDMETHODCALLTYPE GetDXVKBuffer() final;
void SetResourceLayer( void STDMETHODCALLTYPE SetResourceLayer(
IUnknown* pLayer) final; IUnknown* pLayer) final;
private: private:

26
src/dxgi/dxgi_swapchain.cpp
View File

@ -70,7 +70,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::QueryInterface(REFIID riid, void** ppvObject) {
COM_QUERY_IFACE(riid, ppvObject, IUnknown); COM_QUERY_IFACE(riid, ppvObject, IUnknown);
COM_QUERY_IFACE(riid, ppvObject, IDXGIObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIObject);
COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject); COM_QUERY_IFACE(riid, ppvObject, IDXGIDeviceSubObject);
@ -81,17 +81,17 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetParent(REFIID riid, void** ppParent) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetParent(REFIID riid, void** ppParent) {
return m_factory->QueryInterface(riid, ppParent); return m_factory->QueryInterface(riid, ppParent);
} }
HRESULT DxgiSwapChain::GetDevice(REFIID riid, void** ppDevice) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetDevice(REFIID riid, void** ppDevice) {
return m_device->QueryInterface(riid, ppDevice); return m_device->QueryInterface(riid, ppDevice);
} }
HRESULT DxgiSwapChain::GetBuffer(UINT Buffer, REFIID riid, void** ppSurface) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetBuffer(UINT Buffer, REFIID riid, void** ppSurface) {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
if (Buffer > 0) { if (Buffer > 0) {
@ -103,7 +103,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetContainingOutput(IDXGIOutput** ppOutput) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetContainingOutput(IDXGIOutput** ppOutput) {
if (ppOutput != nullptr) if (ppOutput != nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -122,7 +122,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetDesc(DXGI_SWAP_CHAIN_DESC* pDesc) {
if (pDesc == nullptr) if (pDesc == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -132,7 +132,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats) {
if (pStats == nullptr) if (pStats == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -142,7 +142,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetFullscreenState( HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetFullscreenState(
BOOL* pFullscreen, BOOL* pFullscreen,
IDXGIOutput** ppTarget) { IDXGIOutput** ppTarget) {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
@ -159,7 +159,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::GetLastPresentCount(UINT* pLastPresentCount) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetLastPresentCount(UINT* pLastPresentCount) {
if (pLastPresentCount == nullptr) if (pLastPresentCount == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -169,7 +169,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::Present(UINT SyncInterval, UINT Flags) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::Present(UINT SyncInterval, UINT Flags) {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
try { try {
@ -188,7 +188,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::ResizeBuffers( HRESULT STDMETHODCALLTYPE DxgiSwapChain::ResizeBuffers(
UINT BufferCount, UINT BufferCount,
UINT Width, UINT Width,
UINT Height, UINT Height,
@ -223,7 +223,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters) { HRESULT STDMETHODCALLTYPE DxgiSwapChain::ResizeTarget(const DXGI_MODE_DESC* pNewTargetParameters) {
if (pNewTargetParameters == nullptr) if (pNewTargetParameters == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
@ -265,7 +265,7 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::SetFullscreenState( HRESULT STDMETHODCALLTYPE DxgiSwapChain::SetFullscreenState(
BOOL Fullscreen, BOOL Fullscreen,
IDXGIOutput* pTarget) { IDXGIOutput* pTarget) {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);

26
src/dxgi/dxgi_swapchain.h
View File

@ -28,54 +28,54 @@ namespace dxvk {
DXGI_SWAP_CHAIN_DESC* pDesc); DXGI_SWAP_CHAIN_DESC* pDesc);
~DxgiSwapChain(); ~DxgiSwapChain();
HRESULT QueryInterface( HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) final; void** ppvObject) final;
HRESULT GetParent( HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid, REFIID riid,
void** ppParent) final; void** ppParent) final;
HRESULT GetDevice( HRESULT STDMETHODCALLTYPE GetDevice(
REFIID riid, REFIID riid,
void** ppDevice) final; void** ppDevice) final;
HRESULT GetBuffer( HRESULT STDMETHODCALLTYPE GetBuffer(
UINT Buffer, UINT Buffer,
REFIID riid, REFIID riid,
void** ppSurface) final; void** ppSurface) final;
HRESULT GetContainingOutput( HRESULT STDMETHODCALLTYPE GetContainingOutput(
IDXGIOutput **ppOutput) final; IDXGIOutput **ppOutput) final;
HRESULT GetDesc( HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_SWAP_CHAIN_DESC *pDesc) final; DXGI_SWAP_CHAIN_DESC *pDesc) final;
HRESULT GetFrameStatistics( HRESULT STDMETHODCALLTYPE GetFrameStatistics(
DXGI_FRAME_STATISTICS *pStats) final; DXGI_FRAME_STATISTICS *pStats) final;
HRESULT GetFullscreenState( HRESULT STDMETHODCALLTYPE GetFullscreenState(
BOOL *pFullscreen, BOOL *pFullscreen,
IDXGIOutput **ppTarget) final; IDXGIOutput **ppTarget) final;
HRESULT GetLastPresentCount( HRESULT STDMETHODCALLTYPE GetLastPresentCount(
UINT *pLastPresentCount) final; UINT *pLastPresentCount) final;
HRESULT Present( HRESULT STDMETHODCALLTYPE Present(
UINT SyncInterval, UINT SyncInterval,
UINT Flags) final; UINT Flags) final;
HRESULT ResizeBuffers( HRESULT STDMETHODCALLTYPE ResizeBuffers(
UINT BufferCount, UINT BufferCount,
UINT Width, UINT Width,
UINT Height, UINT Height,
DXGI_FORMAT NewFormat, DXGI_FORMAT NewFormat,
UINT SwapChainFlags) final; UINT SwapChainFlags) final;
HRESULT ResizeTarget( HRESULT STDMETHODCALLTYPE ResizeTarget(
const DXGI_MODE_DESC *pNewTargetParameters) final; const DXGI_MODE_DESC *pNewTargetParameters) final;
HRESULT SetFullscreenState( HRESULT STDMETHODCALLTYPE SetFullscreenState(
BOOL Fullscreen, BOOL Fullscreen,
IDXGIOutput *pTarget) final; IDXGIOutput *pTarget) final;

14
src/dxvk/dxvk_device.cpp
View File

@ -172,7 +172,16 @@ namespace dxvk {
Rc<DxvkSwapchain> DxvkDevice::createSwapchain( Rc<DxvkSwapchain> DxvkDevice::createSwapchain(
const Rc<DxvkSurface>& surface, const Rc<DxvkSurface>& surface,
const DxvkSwapchainProperties& properties) { const DxvkSwapchainProperties& properties) {
return new DxvkSwapchain(this, surface, properties, m_presentQueue); return new DxvkSwapchain(this, surface, properties);
}
VkResult DxvkDevice::presentSwapImage(
const VkPresentInfoKHR& presentInfo) {
m_statCounters.increment(DxvkStat::DevQueuePresents, 1);
std::lock_guard<std::mutex> lock(m_submissionLock);
return m_vkd->vkQueuePresentKHR(m_presentQueue, &presentInfo);
} }
@ -195,8 +204,11 @@ namespace dxvk {
commandList->trackResource(wakeSync); commandList->trackResource(wakeSync);
} }
{ // Queue submissions are not thread safe
std::lock_guard<std::mutex> lock(m_submissionLock);
commandList->submit(m_graphicsQueue, commandList->submit(m_graphicsQueue,
waitSemaphore, wakeSemaphore, fence->handle()); waitSemaphore, wakeSemaphore, fence->handle());
}
// TODO Delay synchronization by putting these into a ring buffer // TODO Delay synchronization by putting these into a ring buffer
fence->wait(std::numeric_limits<uint64_t>::max()); fence->wait(std::numeric_limits<uint64_t>::max());

12
src/dxvk/dxvk_device.h
View File

@ -234,6 +234,17 @@ namespace dxvk {
const Rc<DxvkSurface>& surface, const Rc<DxvkSurface>& surface,
const DxvkSwapchainProperties& properties); const DxvkSwapchainProperties& properties);
/**
* \brief Presents a swap chain image
*
* This is implicitly called by the swap chain class
* when presenting an image. Do not use this directly.
* \param [in] presentInfo Swap image present info
* \returns Present status
*/
VkResult presentSwapImage(
const VkPresentInfoKHR& presentInfo);
/** /**
* \brief Submits a command list * \brief Submits a command list
* *
@ -276,6 +287,7 @@ namespace dxvk {
Rc<DxvkRenderPassPool> m_renderPassPool; Rc<DxvkRenderPassPool> m_renderPassPool;
Rc<DxvkPipelineManager> m_pipelineManager; Rc<DxvkPipelineManager> m_pipelineManager;
std::mutex m_submissionLock;
VkQueue m_graphicsQueue = VK_NULL_HANDLE; VkQueue m_graphicsQueue = VK_NULL_HANDLE;
VkQueue m_presentQueue = VK_NULL_HANDLE; VkQueue m_presentQueue = VK_NULL_HANDLE;

6
src/dxvk/dxvk_swapchain.cpp
View File

@ -10,12 +10,10 @@ namespace dxvk {
DxvkSwapchain::DxvkSwapchain( DxvkSwapchain::DxvkSwapchain(
const Rc<DxvkDevice>& device, const Rc<DxvkDevice>& device,
const Rc<DxvkSurface>& surface, const Rc<DxvkSurface>& surface,
const DxvkSwapchainProperties& properties, const DxvkSwapchainProperties& properties)
VkQueue queue)
: m_device (device), : m_device (device),
m_vkd (device->vkd()), m_vkd (device->vkd()),
m_surface (surface), m_surface (surface),
m_queue (queue),
m_properties(properties) { m_properties(properties) {
this->recreateSwapchain(); this->recreateSwapchain();
} }
@ -58,7 +56,7 @@ namespace dxvk {
info.pImageIndices = &m_imageIndex; info.pImageIndices = &m_imageIndex;
info.pResults = nullptr; info.pResults = nullptr;
VkResult status = m_vkd->vkQueuePresentKHR(m_queue, &info); VkResult status = m_device->presentSwapImage(info);
if (status != VK_SUCCESS if (status != VK_SUCCESS
&& status != VK_SUBOPTIMAL_KHR && status != VK_SUBOPTIMAL_KHR

5
src/dxvk/dxvk_swapchain.h
View File

@ -31,8 +31,7 @@ namespace dxvk {
DxvkSwapchain( DxvkSwapchain(
const Rc<DxvkDevice>& device, const Rc<DxvkDevice>& device,
const Rc<DxvkSurface>& surface, const Rc<DxvkSurface>& surface,
const DxvkSwapchainProperties& properties, const DxvkSwapchainProperties& properties);
VkQueue queue);
~DxvkSwapchain(); ~DxvkSwapchain();
/** /**
@ -74,8 +73,6 @@ namespace dxvk {
Rc<vk::DeviceFn> m_vkd; Rc<vk::DeviceFn> m_vkd;
Rc<DxvkSurface> m_surface; Rc<DxvkSurface> m_surface;
VkQueue m_queue;
DxvkSwapchainProperties m_properties; DxvkSwapchainProperties m_properties;
VkSwapchainKHR m_handle = VK_NULL_HANDLE; VkSwapchainKHR m_handle = VK_NULL_HANDLE;
uint32_t m_imageIndex = 0; uint32_t m_imageIndex = 0;

4
src/util/com/com_object.h
View File

@ -22,11 +22,11 @@ namespace dxvk {
virtual ~ComObject() { } virtual ~ComObject() { }
ULONG AddRef() { ULONG STDMETHODCALLTYPE AddRef() {
return ++m_refCount; return ++m_refCount;
} }
ULONG Release() { ULONG STDMETHODCALLTYPE Release() {
ULONG refCount = --m_refCount; ULONG refCount = --m_refCount;
if (refCount == 0) { if (refCount == 0) {
m_refCount += 0x80000000u; m_refCount += 0x80000000u;

4
tests/meson.build
View File

@ -1,7 +1,3 @@
lib_d3d11 = dxvk_compiler.find_library('d3d11')
lib_dxgi = dxvk_compiler.find_library('dxgi')
lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
subdir('d3d11') subdir('d3d11')
subdir('dxbc') subdir('dxbc')
subdir('dxgi') subdir('dxgi')