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

direct3d: be more aggressive about resetting invalidated cached state.

Browse Source 
Fixes Bugzilla #4402.
This commit is contained in:
Ryan C. Gordon 2018-12-03 09:26:05 -05:00
parent 939bf1c4d8
commit cca9d24cde
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/render/direct3d/SDL_render_d3d.c
View File

@ -690,7 +690,7 @@ D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
static void static void
D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture) D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
/*D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;*/ D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata;
D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata; D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;
if (!texturedata) { if (!texturedata) {
@ -706,6 +706,9 @@ D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} else { } else {
IDirect3DTexture9_UnlockRect(texturedata->texture.staging, 0); IDirect3DTexture9_UnlockRect(texturedata->texture.staging, 0);
texturedata->texture.dirty = SDL_TRUE; texturedata->texture.dirty = SDL_TRUE;
if (data->drawstate.texture == texture) {
data->drawstate.texture = NULL;
}
} }
} }
@ -1098,13 +1101,6 @@ SetDrawState(D3D_RenderData *data, const SDL_RenderCommand *cmd)
SDL_Texture *texture = cmd->data.draw.texture; SDL_Texture *texture = cmd->data.draw.texture;
const SDL_BlendMode blend = cmd->data.draw.blend; const SDL_BlendMode blend = cmd->data.draw.blend;
if (texture) {
D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;
if (texturedata) {
UpdateDirtyTexture(data->device, &texturedata->texture);
}
}
if (texture != data->drawstate.texture) { if (texture != data->drawstate.texture) {
D3D_TextureData *oldtexturedata = data->drawstate.texture ? (D3D_TextureData *) data->drawstate.texture->driverdata : NULL; D3D_TextureData *oldtexturedata = data->drawstate.texture ? (D3D_TextureData *) data->drawstate.texture->driverdata : NULL;
D3D_TextureData *newtexturedata = texture ? (D3D_TextureData *) texture->driverdata : NULL; D3D_TextureData *newtexturedata = texture ? (D3D_TextureData *) texture->driverdata : NULL;
@ -1558,6 +1554,7 @@ static int
D3D_Reset(SDL_Renderer * renderer) D3D_Reset(SDL_Renderer * renderer)
{ {
D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata; D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
const Float4X4 d3dmatrix = MatrixIdentity();
HRESULT result; HRESULT result;
SDL_Texture *texture; SDL_Texture *texture;
int i; int i;
@ -1610,6 +1607,13 @@ D3D_Reset(SDL_Renderer * renderer)
D3D_InitRenderState(data); D3D_InitRenderState(data);
D3D_SetRenderTargetInternal(renderer, renderer->target); D3D_SetRenderTargetInternal(renderer, renderer->target);
data->drawstate.viewport_dirty = SDL_TRUE; data->drawstate.viewport_dirty = SDL_TRUE;
data->drawstate.cliprect_dirty = SDL_TRUE;
data->drawstate.cliprect_enabled_dirty = SDL_TRUE;
data->drawstate.texture = NULL;
data->drawstate.shader = NULL;
data->drawstate.blend = SDL_BLENDMODE_INVALID;
data->drawstate.is_copy_ex = SDL_FALSE;
IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)&d3dmatrix);
/* Let the application know that render targets were reset */ /* Let the application know that render targets were reset */
{ {