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

[d3d11] Implement Map / Unmap for IDXGISurface2

Browse Source
This commit is contained in:
Philip Rebohle 2019-04-27 16:17:50 +02:00
parent af15aa0c32
commit d1a019a043
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/d3d11/d3d11_texture.cpp
View File

@ -479,7 +479,7 @@ namespace dxvk {
D3D11DXGISurface::D3D11DXGISurface( D3D11DXGISurface::D3D11DXGISurface(
ID3D11DeviceChild* pContainer, ID3D11Resource* pContainer,
D3D11CommonTexture* pTexture) D3D11CommonTexture* pTexture)
: m_container (pContainer), : m_container (pContainer),
m_texture (pTexture) { m_texture (pTexture) {
@ -563,24 +563,54 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D11DXGISurface::Map( HRESULT STDMETHODCALLTYPE D3D11DXGISurface::Map(
DXGI_MAPPED_RECT* pLockedRect, DXGI_MAPPED_RECT* pLockedRect,
UINT MapFlags) { UINT MapFlags) {
static bool s_errorShown = false; Com<ID3D11Device> device;
Com<ID3D11DeviceContext> context;
if (!std::exchange(s_errorShown, true)) m_container->GetDevice(&device);
Logger::err("D3D11DXGISurface::Map: Stub"); device->GetImmediateContext(&context);
return E_NOTIMPL; if (pLockedRect) {
pLockedRect->Pitch = 0;
pLockedRect->pBits = nullptr;
}
D3D11_MAP mapType;
if (MapFlags & (DXGI_MAP_READ | DXGI_MAP_WRITE))
mapType = D3D11_MAP_READ_WRITE;
else if (MapFlags & DXGI_MAP_READ)
mapType = D3D11_MAP_READ;
else if (MapFlags & (DXGI_MAP_WRITE | DXGI_MAP_DISCARD))
mapType = D3D11_MAP_WRITE_DISCARD;
else if (MapFlags & DXGI_MAP_WRITE)
mapType = D3D11_MAP_WRITE;
else
return DXGI_ERROR_INVALID_CALL;
D3D11_MAPPED_SUBRESOURCE sr;
HRESULT hr = context->Map(m_container, 0,
mapType, 0, pLockedRect ? &sr : nullptr);
if (hr != S_OK)
return hr;
pLockedRect->Pitch = sr.RowPitch;
pLockedRect->pBits = reinterpret_cast<unsigned char*>(sr.pData);
return hr;
} }
HRESULT STDMETHODCALLTYPE D3D11DXGISurface::Unmap() { HRESULT STDMETHODCALLTYPE D3D11DXGISurface::Unmap() {
static bool s_errorShown = false; Com<ID3D11Device> device;
Com<ID3D11DeviceContext> context;
if (!std::exchange(s_errorShown, true)) m_container->GetDevice(&device);
Logger::err("D3D11DXGISurface::Unmap: Stub"); device->GetImmediateContext(&context);
return E_NOTIMPL; context->Unmap(m_container, 0);
return S_OK;
} }

4
src/d3d11/d3d11_texture.h
View File

@ -239,7 +239,7 @@ namespace dxvk {
public: public:
D3D11DXGISurface( D3D11DXGISurface(
ID3D11DeviceChild* pContainer, ID3D11Resource* pContainer,
D3D11CommonTexture* pTexture); D3D11CommonTexture* pTexture);
~D3D11DXGISurface(); ~D3D11DXGISurface();
@ -299,7 +299,7 @@ namespace dxvk {
private: private:
ID3D11DeviceChild* m_container; ID3D11Resource* m_container;
D3D11CommonTexture* m_texture; D3D11CommonTexture* m_texture;
}; };