ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-23 22:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync D3D_RenderReadPixels with D3D11_RenderReadPixels

Browse source 
- use the result of SDL_ConvertPixels to propagate error
- get rid of the verbose error message of D3D11_RenderReadPixels in case SDL_ConvertPixels failed
This commit is contained in:
pionere 2022-01-22 17:10:37 +01:00 committed by Ryan C. Gordon
parent 3bef4a5da6
commit 2cfc83eab7
No known key found for this signature in database
GPG key ID: FA148B892AB48044
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/render/direct3d/SDL_render_d3d.c
View file

@ -1271,6 +1271,7 @@ D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
RECT d3drect; RECT d3drect;
D3DLOCKED_RECT locked; D3DLOCKED_RECT locked;
HRESULT result; HRESULT result;
int status;
if (data->currentRenderTarget) { if (data->currentRenderTarget) {
backBuffer = data->currentRenderTarget; backBuffer = data->currentRenderTarget;
@ -1305,7 +1306,7 @@ D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
return D3D_SetError("LockRect()", result); return D3D_SetError("LockRect()", result);
} }
SDL_ConvertPixels(rect->w, rect->h, status = SDL_ConvertPixels(rect->w, rect->h,
D3DFMTToPixelFormat(desc.Format), locked.pBits, locked.Pitch, D3DFMTToPixelFormat(desc.Format), locked.pBits, locked.Pitch,
format, pixels, pitch); format, pixels, pitch);
@ -1313,7 +1314,7 @@ D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(surface);
return 0; return status;
} }
static void static void

14
src/render/direct3d11/SDL_render_d3d11.c
View file

@ -2235,30 +2235,20 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
/* Copy the data into the desired buffer, converting pixels to the /* Copy the data into the desired buffer, converting pixels to the
* desired format at the same time: * desired format at the same time:
*/ */
if (SDL_ConvertPixels( status = SDL_ConvertPixels(
rect->w, rect->h, rect->w, rect->h,
D3D11_DXGIFormatToSDLPixelFormat(stagingTextureDesc.Format), D3D11_DXGIFormatToSDLPixelFormat(stagingTextureDesc.Format),
textureMemory.pData, textureMemory.pData,
textureMemory.RowPitch, textureMemory.RowPitch,
format, format,
pixels, pixels,
pitch) != 0) { pitch);
/* When SDL_ConvertPixels fails, it'll have already set the format.
* Get the error message, and attach some extra data to it.
*/
char errorMessage[1024];
SDL_snprintf(errorMessage, sizeof(errorMessage), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError());
SDL_SetError("%s", errorMessage);
goto done;
}
/* Unmap the texture: */ /* Unmap the texture: */
ID3D11DeviceContext_Unmap(data->d3dContext, ID3D11DeviceContext_Unmap(data->d3dContext,
(ID3D11Resource *)stagingTexture, (ID3D11Resource *)stagingTexture,
0); 0);
status = 0;
done: done:
SAFE_RELEASE(backBuffer); SAFE_RELEASE(backBuffer);
SAFE_RELEASE(stagingTexture); SAFE_RELEASE(stagingTexture);