Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] dxgi: update d3d11 backend to make use of comRef

Browse Source
This commit is contained in:
Geoffrey McRae 2023-10-27 18:44:17 +11:00
parent 35b0f8edf3
commit fffac35300
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
host/platform/Windows/capture/DXGI/src/d3d11.c
View File

@ -19,6 +19,7 @@
*/ */
#include "dxgi_capture.h" #include "dxgi_capture.h"
#include "com_ref.h"
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
@ -34,9 +35,9 @@ struct D3D11Backend
struct D3D11TexImpl struct D3D11TexImpl
{ {
ID3D11Texture2D * gpu; ID3D11Texture2D ** gpu;
ID3D11Texture2D * cpu; ID3D11Texture2D ** cpu;
ID3D11ShaderResourceView * srv; ID3D11ShaderResourceView ** srv;
}; };
#define TEXIMPL(x) ((struct D3D11TexImpl *)(x).impl) #define TEXIMPL(x) ((struct D3D11TexImpl *)(x).impl)
@ -103,7 +104,7 @@ static bool d3d11_create(struct DXGIInterface * intf)
struct D3D11TexImpl * teximpl = TEXIMPL(dxgi->texture[i]); struct D3D11TexImpl * teximpl = TEXIMPL(dxgi->texture[i]);
status = ID3D11Device_CreateTexture2D(*dxgi->device, &cpuTexDesc, NULL, status = ID3D11Device_CreateTexture2D(*dxgi->device, &cpuTexDesc, NULL,
&teximpl->cpu); (ID3D11Texture2D **)comRef_newGlobal(&teximpl->cpu));
if (FAILED(status)) if (FAILED(status))
{ {
@ -115,7 +116,7 @@ static bool d3d11_create(struct DXGIInterface * intf)
continue; continue;
status = ID3D11Device_CreateTexture2D(*dxgi->device, &gpuTexDesc, NULL, status = ID3D11Device_CreateTexture2D(*dxgi->device, &gpuTexDesc, NULL,
&teximpl->gpu); (ID3D11Texture2D **)comRef_newGlobal(&teximpl->gpu));
if (FAILED(status)) if (FAILED(status))
{ {
@ -124,13 +125,14 @@ static bool d3d11_create(struct DXGIInterface * intf)
} }
ID3D11Device_CreateShaderResourceView(*dxgi->device, ID3D11Device_CreateShaderResourceView(*dxgi->device,
(ID3D11Resource *)teximpl->gpu, NULL, &teximpl->srv); *(ID3D11Resource **)teximpl->gpu, NULL,
(ID3D11ShaderResourceView **)comRef_newGlobal(&teximpl->srv));
} }
// map the texture simply to get the pitch and stride // map the texture simply to get the pitch and stride
D3D11_MAPPED_SUBRESOURCE mapping; D3D11_MAPPED_SUBRESOURCE mapping;
status = ID3D11DeviceContext_Map(*dxgi->deviceContext, status = ID3D11DeviceContext_Map(*dxgi->deviceContext,
(ID3D11Resource *)TEXIMPL(dxgi->texture[0])->cpu, 0, *(ID3D11Resource **)TEXIMPL(dxgi->texture[0])->cpu, 0,
D3D11_MAP_READ, 0, &mapping); D3D11_MAP_READ, 0, &mapping);
if (FAILED(status)) if (FAILED(status))
@ -143,7 +145,7 @@ static bool d3d11_create(struct DXGIInterface * intf)
dxgi->stride = mapping.RowPitch / dxgi->bpp; dxgi->stride = mapping.RowPitch / dxgi->bpp;
ID3D11DeviceContext_Unmap(*dxgi->deviceContext, ID3D11DeviceContext_Unmap(*dxgi->deviceContext,
(ID3D11Resource *)TEXIMPL(dxgi->texture[0])->cpu, 0); *(ID3D11Resource **)TEXIMPL(dxgi->texture[0])->cpu, 0);
return true; return true;
@ -159,19 +161,8 @@ static void d3d11_free(void)
for (int i = 0; i < dxgi->maxTextures; ++i) for (int i = 0; i < dxgi->maxTextures; ++i)
{ {
struct D3D11TexImpl * teximpl = TEXIMPL(dxgi->texture[i]); struct D3D11TexImpl * teximpl = TEXIMPL(dxgi->texture[i]);
if (!teximpl)
continue;
if (teximpl->cpu)
ID3D11Texture2D_Release(teximpl->cpu);
if (teximpl->gpu)
ID3D11Texture2D_Release(teximpl->gpu);
if (teximpl->srv)
ID3D11ShaderResourceView_Release(teximpl->srv);
free(teximpl); free(teximpl);
teximpl = NULL;
} }
runningavg_free(&this->avgMapTime); runningavg_free(&this->avgMapTime);
@ -182,7 +173,7 @@ static void d3d11_free(void)
static void copyFrameFull(Texture * tex, ID3D11Texture2D * src) static void copyFrameFull(Texture * tex, ID3D11Texture2D * src)
{ {
struct D3D11TexImpl * teximpl = TEXIMPL(*tex); struct D3D11TexImpl * teximpl = TEXIMPL(*tex);
ID3D11Texture2D * dst = teximpl->cpu; ID3D11Texture2D * dst = *teximpl->cpu;
if (tex->texDamageCount < 0) if (tex->texDamageCount < 0)
ID3D11DeviceContext_CopyResource(*dxgi->deviceContext, ID3D11DeviceContext_CopyResource(*dxgi->deviceContext,
@ -211,7 +202,7 @@ static void copyFrameFull(Texture * tex, ID3D11Texture2D * src)
static void copyFrameDownsampled(Texture * tex, ID3D11Texture2D * src) static void copyFrameDownsampled(Texture * tex, ID3D11Texture2D * src)
{ {
struct D3D11TexImpl * teximpl = TEXIMPL(*tex); struct D3D11TexImpl * teximpl = TEXIMPL(*tex);
ID3D11Texture2D * dst = teximpl->gpu; ID3D11Texture2D * dst = *teximpl->gpu;
if (tex->texDamageCount < 0) if (tex->texDamageCount < 0)
ID3D11DeviceContext_ResolveSubresource(*dxgi->deviceContext, ID3D11DeviceContext_ResolveSubresource(*dxgi->deviceContext,
@ -238,11 +229,11 @@ static void copyFrameDownsampled(Texture * tex, ID3D11Texture2D * src)
} }
} }
ID3D11DeviceContext_GenerateMips(*dxgi->deviceContext, teximpl->srv); ID3D11DeviceContext_GenerateMips(*dxgi->deviceContext, *teximpl->srv);
if (tex->texDamageCount < 0) if (tex->texDamageCount < 0)
ID3D11DeviceContext_CopySubresourceRegion(*dxgi->deviceContext, ID3D11DeviceContext_CopySubresourceRegion(*dxgi->deviceContext,
(ID3D11Resource *)teximpl->cpu, 0, 0, 0, 0, *(ID3D11Resource **)teximpl->cpu, 0, 0, 0, 0,
(ID3D11Resource *)dst , dxgi->downsampleLevel, NULL); (ID3D11Resource * )dst , dxgi->downsampleLevel, NULL);
else else
{ {
for (int i = 0; i < tex->texDamageCount; ++i) for (int i = 0; i < tex->texDamageCount; ++i)
@ -259,8 +250,8 @@ static void copyFrameDownsampled(Texture * tex, ID3D11Texture2D * src)
}; };
ID3D11DeviceContext_CopySubresourceRegion(*dxgi->deviceContext, ID3D11DeviceContext_CopySubresourceRegion(*dxgi->deviceContext,
(ID3D11Resource *)teximpl->cpu, 0, box.left, box.top, 0, *(ID3D11Resource **)teximpl->cpu, 0, box.left, box.top, 0,
(ID3D11Resource *)dst , dxgi->downsampleLevel, &box); (ID3D11Resource * )dst , dxgi->downsampleLevel, &box);
} }
} }
} }
@ -273,7 +264,7 @@ static bool d3d11_copyFrame(Texture * tex, ID3D11Texture2D * src)
{ {
tex->copyTime = microtime(); tex->copyTime = microtime();
if (teximpl->gpu) if (teximpl->gpu && *teximpl->gpu)
copyFrameDownsampled(tex, src); copyFrameDownsampled(tex, src);
else else
copyFrameFull(tex, src); copyFrameFull(tex, src);
@ -300,7 +291,7 @@ static CaptureResult d3d11_mapTexture(Texture * tex)
INTERLOCKED_SECTION(dxgi->deviceContextLock, { INTERLOCKED_SECTION(dxgi->deviceContextLock, {
status = ID3D11DeviceContext_Map(*dxgi->deviceContext, status = ID3D11DeviceContext_Map(*dxgi->deviceContext,
(ID3D11Resource *)teximpl->cpu, 0, D3D11_MAP_READ, 0x100000L, &map); (ID3D11Resource *)*teximpl->cpu, 0, D3D11_MAP_READ, 0x100000L, &map);
}); });
if (status == DXGI_ERROR_WAS_STILL_DRAWING) if (status == DXGI_ERROR_WAS_STILL_DRAWING)
{ {
@ -334,7 +325,7 @@ static void d3d11_unmapTexture(Texture * tex)
INTERLOCKED_SECTION(dxgi->deviceContextLock, { INTERLOCKED_SECTION(dxgi->deviceContextLock, {
ID3D11DeviceContext_Unmap(*dxgi->deviceContext, ID3D11DeviceContext_Unmap(*dxgi->deviceContext,
(ID3D11Resource *)teximpl->cpu, 0); (ID3D11Resource *)*teximpl->cpu, 0);
}); });
tex->map = NULL; tex->map = NULL;
} }

2
host/platform/Windows/capture/DXGI/src/d3d12.c
View File

@ -132,7 +132,7 @@ static bool d3d12_create(struct DXGIInterface * intf)
this->copySleep = option_get_float("dxgi", "d3d12CopySleep"); this->copySleep = option_get_float("dxgi", "d3d12CopySleep");
DEBUG_INFO("Sleep before copy : %f ms", this->copySleep); DEBUG_INFO("Sleep before copy : %f ms", this->copySleep);
status = D3D12CreateDevice((IUnknown *) dxgi->adapter, D3D_FEATURE_LEVEL_11_0, status = D3D12CreateDevice(*(IUnknown **)dxgi->adapter, D3D_FEATURE_LEVEL_11_0,
&IID_ID3D12Device, (void **)&this->device); &IID_ID3D12Device, (void **)&this->device);
if (FAILED(status)) if (FAILED(status))