We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix for the bug

sdl2_windows-sdl_update_texture_crash.patch (text/plain), 987 bytes, created by Damian Kaczmarek on 2014-08-08 16:56:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Damian Kaczmarek

Created: 2014-08-08 16:56:30 UTC

Size: 987 bytes

patch

obsolete

>diff -r c3ec7c3e6c24 src/render/direct3d/SDL_render_d3d.c
>--- a/src/render/direct3d/SDL_render_d3d.c	Wed Aug 06 11:34:54 2014 -0700
>+++ b/src/render/direct3d/SDL_render_d3d.c	Fri Aug 08 18:53:55 2014 +0200
>@@ -897,7 +897,9 @@
>     d3drect.right = x + w;
>     d3drect.top = y;
>     d3drect.bottom = y + h;
>-    result = IDirect3DTexture9_LockRect(texture->staging, 0, &locked, &d3drect, 0);
>+    
>+    // texture->staging is NULL for SDL_TEXTUREACCESS_TARGET
>+    result = IDirect3DTexture9_LockRect(texture->staging?texture->staging:texture->texture, 0, &locked, &d3drect, 0);
>     if (FAILED(result)) {
>         return D3D_SetError("LockRect()", result);
>     }
>@@ -920,7 +922,7 @@
>             dst += locked.Pitch;
>         }
>     }
>-    result = IDirect3DTexture9_UnlockRect(texture->staging, 0);
>+    result = IDirect3DTexture9_UnlockRect(texture->staging?texture->staging:texture->texture, 0);
>     if (FAILED(result)) {
>         return D3D_SetError("UnlockRect()", result);
>     }

Actions: View | Diff

Attachments on bug 2677: 1806 | 1807

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.