Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-29 20:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

WinRT: utilized SDL_SetError's return value in the d3d11 renderer

Browse Source
This commit is contained in:
David Ludwig 2013-12-25 12:52:16 -05:00
parent 43e27aa82e
commit 10f2de1e69
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/render/direct3d11/SDL_render_d3d11.cpp
View File

@ -973,9 +973,8 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
HRESULT result; HRESULT result;
DXGI_FORMAT textureFormat = SDLPixelFormatToDXGIFormat(texture->format); DXGI_FORMAT textureFormat = SDLPixelFormatToDXGIFormat(texture->format);
if (textureFormat == SDL_PIXELFORMAT_UNKNOWN) { if (textureFormat == SDL_PIXELFORMAT_UNKNOWN) {
SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified",
__FUNCTION__, texture->format); __FUNCTION__, texture->format);
return -1;
} }
textureData = new D3D11_TextureData; textureData = new D3D11_TextureData;
@ -1106,8 +1105,7 @@ D3D11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
// An error is already set. Attach some info to it, then return to // An error is already set. Attach some info to it, then return to
// the caller. // the caller.
std::string errorMessage = string(__FUNCTION__ ", Lock Texture Failed: ") + SDL_GetError(); std::string errorMessage = string(__FUNCTION__ ", Lock Texture Failed: ") + SDL_GetError();
SDL_SetError(errorMessage.c_str()); return SDL_SetError(errorMessage.c_str());
return -1;
} }
// Copy pixel data to the locked texture's memory: // Copy pixel data to the locked texture's memory:
@ -1135,8 +1133,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
HRESULT result = S_OK; HRESULT result = S_OK;
if (textureData->stagingTexture) { if (textureData->stagingTexture) {
SDL_SetError("texture is already locked"); return SDL_SetError("texture is already locked");
return -1;
} }
// Create a 'staging' texture, which will be used to write to a portion // Create a 'staging' texture, which will be used to write to a portion
@ -1228,8 +1225,7 @@ D3D11_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
if (!textureData->mainTextureRenderTargetView) { if (!textureData->mainTextureRenderTargetView) {
std::string errorMessage = string(__FUNCTION__) + ": specified texture is not a render target"; std::string errorMessage = string(__FUNCTION__) + ": specified texture is not a render target";
SDL_SetError(errorMessage.c_str()); return SDL_SetError(errorMessage.c_str());
return -1;
} }
rendererData->currentOffscreenRenderTargetView = textureData->mainTextureRenderTargetView; rendererData->currentOffscreenRenderTargetView = textureData->mainTextureRenderTargetView;
@ -1268,8 +1264,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer)
XMStoreFloat4x4(&data->vertexShaderConstantsData.projection, XMMatrixRotationZ(-XM_PIDIV2)); XMStoreFloat4x4(&data->vertexShaderConstantsData.projection, XMMatrixRotationZ(-XM_PIDIV2));
break; break;
default: default:
SDL_SetError("An unknown DisplayOrientation is being used"); return SDL_SetError("An unknown DisplayOrientation is being used");
return -1;
} }
// //
@ -1892,8 +1887,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
// When SDL_ConvertPixels fails, it'll have already set the format. // When SDL_ConvertPixels fails, it'll have already set the format.
// Get the error message, and attach some extra data to it. // Get the error message, and attach some extra data to it.
std::string errorMessage = string(__FUNCTION__ ", Convert Pixels failed: ") + SDL_GetError(); std::string errorMessage = string(__FUNCTION__ ", Convert Pixels failed: ") + SDL_GetError();
SDL_SetError(errorMessage.c_str()); return SDL_SetError(errorMessage.c_str());
return -1;
} }
// Unmap the texture: // Unmap the texture: