backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Use HeapAlloc for lock surface memory allocations

Browse Source
This commit is contained in:
narzoul 2019-08-21 14:51:48 +02:00
parent 55e08f62d4
commit 590b6f1ad0
3 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DDrawCompat/D3dDdi/Device.cpp
View File

@ -263,12 +263,12 @@ namespace D3dDdi
void Device::addDirtyRenderTarget(Resource& resource, UINT subResourceIndex) void Device::addDirtyRenderTarget(Resource& resource, UINT subResourceIndex)
{ {
m_dirtyRenderTargets.emplace(std::make_pair(resource, subResourceIndex), resource); m_dirtyRenderTargets.emplace(std::make_pair(static_cast<HANDLE>(resource), subResourceIndex), resource);
} }
void Device::addDirtyTexture(Resource& resource, UINT subResourceIndex) void Device::addDirtyTexture(Resource& resource, UINT subResourceIndex)
{ {
m_dirtyTextures.emplace(std::make_pair(resource, subResourceIndex), resource); m_dirtyTextures.emplace(std::make_pair(static_cast<HANDLE>(resource), subResourceIndex), resource);
} }
Resource* Device::getGdiResource() Resource* Device::getGdiResource()
@ -306,12 +306,12 @@ namespace D3dDdi
void Device::removeDirtyRenderTarget(Resource& resource, UINT subResourceIndex) void Device::removeDirtyRenderTarget(Resource& resource, UINT subResourceIndex)
{ {
m_dirtyRenderTargets.erase(std::make_pair(resource, subResourceIndex)); m_dirtyRenderTargets.erase(std::make_pair(static_cast<HANDLE>(resource), subResourceIndex));
} }
void Device::removeDirtyTexture(Resource& resource, UINT subResourceIndex) void Device::removeDirtyTexture(Resource& resource, UINT subResourceIndex)
{ {
m_dirtyTextures.erase(std::make_pair(resource, subResourceIndex)); m_dirtyTextures.erase(std::make_pair(static_cast<HANDLE>(resource), subResourceIndex));
} }
void Device::add(HANDLE adapter, HANDLE device) void Device::add(HANDLE adapter, HANDLE device)

62
DDrawCompat/D3dDdi/Resource.cpp
View File

@ -70,6 +70,11 @@ namespace
return flags; return flags;
} }
void heapFree(void* p)
{
HeapFree(GetProcessHeap(), 0, p);
}
void splitToTiles(D3DDDIARG_CREATERESOURCE& data, const UINT tileWidth, const UINT tileHeight) void splitToTiles(D3DDDIARG_CREATERESOURCE& data, const UINT tileWidth, const UINT tileHeight)
{ {
static std::vector<D3DDDI_SURFACEINFO> tiles; static std::vector<D3DDDI_SURFACEINFO> tiles;
@ -183,6 +188,7 @@ namespace D3dDdi
, m_handle(nullptr) , m_handle(nullptr)
, m_origData(data) , m_origData(data)
, m_lockResource(nullptr) , m_lockResource(nullptr)
, m_lockBuffer(nullptr, &heapFree)
, m_canCreateLockResource(false) , m_canCreateLockResource(false)
{ {
} }
@ -350,32 +356,38 @@ namespace D3dDdi
void Resource::createLockResource() void Resource::createLockResource()
{ {
std::vector<D3DDDI_SURFACEINFO> surfaceInfo(m_fixedData.SurfCount); std::vector<D3DDDI_SURFACEINFO> surfaceInfo(m_fixedData.SurfCount);
m_lockBuffers.resize(m_fixedData.SurfCount); for (UINT i = 0; i < m_fixedData.SurfCount; ++i)
{
surfaceInfo[i].Width = m_fixedData.pSurfList[i].Width;
surfaceInfo[i].Height = m_fixedData.pSurfList[i].Height;
surfaceInfo[i].SysMemPitch = (surfaceInfo[i].Width * m_formatInfo.bytesPerPixel + 7) & ~7;
if (i != 0)
{
std::uintptr_t offset = reinterpret_cast<std::uintptr_t>(surfaceInfo[i - 1].pSysMem) +
((surfaceInfo[i - 1].SysMemPitch * surfaceInfo[i - 1].Height + 15) & ~15);
surfaceInfo[i].pSysMem = reinterpret_cast<void*>(offset);
}
}
std::uintptr_t bufferSize = reinterpret_cast<std::uintptr_t>(surfaceInfo.back().pSysMem) +
surfaceInfo.back().SysMemPitch * surfaceInfo.back().Height + 8;
m_lockBuffer.reset(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize));
BYTE* bufferStart = static_cast<BYTE*>(m_lockBuffer.get());
if (0 == reinterpret_cast<std::uintptr_t>(bufferStart) % 16)
{
bufferStart += 8;
}
for (UINT i = 0; i < m_fixedData.SurfCount; ++i) for (UINT i = 0; i < m_fixedData.SurfCount; ++i)
{ {
auto width = m_fixedData.pSurfList[i].Width; surfaceInfo[i].pSysMem = bufferStart + reinterpret_cast<uintptr_t>(surfaceInfo[i].pSysMem);
auto height = m_fixedData.pSurfList[i].Height;
auto pitch = divCeil(width * m_formatInfo.bytesPerPixel, 8) * 8;
m_lockBuffers[i].resize(pitch * height + 8);
surfaceInfo[i].Width = width;
surfaceInfo[i].Height = height;
if (reinterpret_cast<std::uintptr_t>(m_lockBuffers[i].data()) % 16 == 0)
{
surfaceInfo[i].pSysMem = m_lockBuffers[i].data() + 8;
}
else
{
surfaceInfo[i].pSysMem = m_lockBuffers[i].data();
}
surfaceInfo[i].SysMemPitch = pitch;
} }
createSysMemResource(surfaceInfo); createSysMemResource(surfaceInfo);
if (!m_lockResource) if (!m_lockResource)
{ {
m_lockBuffers.clear(); m_lockBuffer.reset();
m_lockData.clear(); m_lockData.clear();
} }
} }
@ -465,17 +477,19 @@ namespace D3dDdi
void Resource::destroyLockResource() void Resource::destroyLockResource()
{ {
for (UINT i = 0; i < m_lockData.size(); ++i)
{
setSysMemUpToDate(i, false);
setVidMemUpToDate(i, true);
}
if (m_lockResource) if (m_lockResource)
{ {
for (UINT i = 0; i < m_lockData.size(); ++i)
{
setSysMemUpToDate(i, false);
setVidMemUpToDate(i, true);
}
m_device.getOrigVtable().pfnDestroyResource(m_device, m_lockResource); m_device.getOrigVtable().pfnDestroyResource(m_device, m_lockResource);
m_lockResource = nullptr; m_lockResource = nullptr;
m_lockBuffers.clear();
} }
m_lockBuffer.reset();
} }
void Resource::fixVertexData(UINT offset, UINT count, UINT stride) void Resource::fixVertexData(UINT offset, UINT count, UINT stride)

3
DDrawCompat/D3dDdi/Resource.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <memory>
#include <vector> #include <vector>
#include <d3d.h> #include <d3d.h>
@ -97,7 +98,7 @@ namespace D3dDdi
FormatInfo m_formatInfo; FormatInfo m_formatInfo;
HANDLE m_lockResource; HANDLE m_lockResource;
std::vector<LockData> m_lockData; std::vector<LockData> m_lockData;
std::vector<std::vector<BYTE>> m_lockBuffers; std::unique_ptr<void, void(*)(void*)> m_lockBuffer;
bool m_canCreateLockResource; bool m_canCreateLockResource;
}; };
} }