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

Fixed bug 4582 - Maximize/Resize not working on Windows 10

Browse Source 
When viewport is set, projectionAndView changes, but ID3D11DeviceContext_UpdateSubresource was not called.
This commit is contained in:
Sylvain Becker 2019-04-08 13:43:48 +02:00
parent eb7affeeb8
commit d68e501db4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/render/direct3d11/SDL_render_d3d11.c
View File

@ -1897,7 +1897,7 @@ D3D11_UpdateViewport(SDL_Renderer * renderer)
* with a non-empty viewport. * with a non-empty viewport.
*/ */
/* SDL_Log("%s, no viewport was set!\n", __FUNCTION__); */ /* SDL_Log("%s, no viewport was set!\n", __FUNCTION__); */
return 0; return -1;
} }
/* Make sure the SDL viewport gets rotated to that of the physical display's rotation. /* Make sure the SDL viewport gets rotated to that of the physical display's rotation.
@ -1997,6 +1997,7 @@ D3D11_SetDrawState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, ID3D11
ID3D11ShaderResourceView *shaderResource; ID3D11ShaderResourceView *shaderResource;
const SDL_BlendMode blendMode = cmd->data.draw.blend; const SDL_BlendMode blendMode = cmd->data.draw.blend;
ID3D11BlendState *blendState = NULL; ID3D11BlendState *blendState = NULL;
SDL_bool updateSubresource = SDL_FALSE;
if (renderTargetView != rendererData->currentRenderTargetView) { if (renderTargetView != rendererData->currentRenderTargetView) {
ID3D11DeviceContext_OMSetRenderTargets(rendererData->d3dContext, ID3D11DeviceContext_OMSetRenderTargets(rendererData->d3dContext,
@ -2008,7 +2009,10 @@ D3D11_SetDrawState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, ID3D11
} }
if (rendererData->viewportDirty) { if (rendererData->viewportDirty) {
D3D11_UpdateViewport(renderer); if (D3D11_UpdateViewport(renderer) == 0) {
/* vertexShaderConstantsData.projectionAndView has changed */
updateSubresource = SDL_TRUE;
}
} }
if (rendererData->cliprectDirty) { if (rendererData->cliprectDirty) {
@ -2073,7 +2077,7 @@ D3D11_SetDrawState(SDL_Renderer * renderer, const SDL_RenderCommand *cmd, ID3D11
rendererData->currentSampler = sampler; rendererData->currentSampler = sampler;
} }
if (SDL_memcmp(&rendererData->vertexShaderConstantsData.model, newmatrix, sizeof (*newmatrix)) != 0) { if (updateSubresource == SDL_TRUE || SDL_memcmp(&rendererData->vertexShaderConstantsData.model, newmatrix, sizeof (*newmatrix)) != 0) {
SDL_memcpy(&rendererData->vertexShaderConstantsData.model, newmatrix, sizeof (*newmatrix)); SDL_memcpy(&rendererData->vertexShaderConstantsData.model, newmatrix, sizeof (*newmatrix));
ID3D11DeviceContext_UpdateSubresource(rendererData->d3dContext, ID3D11DeviceContext_UpdateSubresource(rendererData->d3dContext,
(ID3D11Resource *)rendererData->vertexShaderConstants, (ID3D11Resource *)rendererData->vertexShaderConstants,