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

[d3d9] Never init pSharedHandle.

Browse Source 
This parameter has three different meanings if it's non NULL:
- if Pool is D3DPOOL_SYSTEMMEM it's a host pointer for inital data
- if it points to a nullptr it's a output handle
- if it's a pointer to non NULL pointer it's an import handle
This commit is contained in:
Georg Lehmann 2021-07-14 17:24:41 +02:00 committed by Joshie
parent 5f1629f2cb
commit b3b2f0921c
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/d3d9/d3d9_device.cpp
View File

@ -406,8 +406,6 @@ namespace dxvk {
if (Pool == D3DPOOL_SYSTEMMEM && Levels == 1 && pSharedHandle != nullptr) if (Pool == D3DPOOL_SYSTEMMEM && Levels == 1 && pSharedHandle != nullptr)
initialData = *(reinterpret_cast<void**>(pSharedHandle)); initialData = *(reinterpret_cast<void**>(pSharedHandle));
else // This must be a shared resource.
InitReturnPtr(pSharedHandle);
m_initializer->InitTexture(texture->GetCommonTexture(), initialData); m_initializer->InitTexture(texture->GetCommonTexture(), initialData);
*ppTexture = texture.ref(); *ppTexture = texture.ref();
@ -432,7 +430,6 @@ namespace dxvk {
IDirect3DVolumeTexture9** ppVolumeTexture, IDirect3DVolumeTexture9** ppVolumeTexture,
HANDLE* pSharedHandle) { HANDLE* pSharedHandle) {
InitReturnPtr(ppVolumeTexture); InitReturnPtr(ppVolumeTexture);
InitReturnPtr(pSharedHandle);
if (unlikely(ppVolumeTexture == nullptr)) if (unlikely(ppVolumeTexture == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
@ -478,7 +475,6 @@ namespace dxvk {
IDirect3DCubeTexture9** ppCubeTexture, IDirect3DCubeTexture9** ppCubeTexture,
HANDLE* pSharedHandle) { HANDLE* pSharedHandle) {
InitReturnPtr(ppCubeTexture); InitReturnPtr(ppCubeTexture);
InitReturnPtr(pSharedHandle);
if (unlikely(ppCubeTexture == nullptr)) if (unlikely(ppCubeTexture == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
@ -3395,7 +3391,6 @@ namespace dxvk {
HANDLE* pSharedHandle, HANDLE* pSharedHandle,
DWORD Usage) { DWORD Usage) {
InitReturnPtr(ppSurface); InitReturnPtr(ppSurface);
InitReturnPtr(pSharedHandle);
if (unlikely(ppSurface == nullptr)) if (unlikely(ppSurface == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
@ -3440,7 +3435,6 @@ namespace dxvk {
HANDLE* pSharedHandle, HANDLE* pSharedHandle,
DWORD Usage) { DWORD Usage) {
InitReturnPtr(ppSurface); InitReturnPtr(ppSurface);
InitReturnPtr(pSharedHandle);
if (unlikely(ppSurface == nullptr)) if (unlikely(ppSurface == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
@ -3487,7 +3481,6 @@ namespace dxvk {
HANDLE* pSharedHandle, HANDLE* pSharedHandle,
DWORD Usage) { DWORD Usage) {
InitReturnPtr(ppSurface); InitReturnPtr(ppSurface);
InitReturnPtr(pSharedHandle);
if (unlikely(ppSurface == nullptr)) if (unlikely(ppSurface == nullptr))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;