commit f7e53b25ae4b9f5b22b1a72396df0559e4c1004e
author Ryan C. Gordon <icculus@icculus.org> Fri Jun 21 15:07:39 2019 -0400
committer Ryan C. Gordon <icculus@icculus.org> Fri Jun 21 15:07:39 2019 -0400
tree e0164ea99f0ecb9320ee201b8cc4c33fab651896
parent af46b86d33c33717bd2a55edfd80af3a35b549b6

direct3d: Use D3DPOOL_DEFAULT for vertex buffers after all, release correctly.

Fixes Bugzilla #4679.
Fixes Bugzilla #4537.

src/render/direct3d/SDL_render_d3d.c

diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index c1e1231..9fb009f 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -1223,7 +1223,7 @@
             IDirect3DVertexBuffer9_Release(vbo);
         }
 
-        if (FAILED(IDirect3DDevice9_CreateVertexBuffer(data->device, (UINT) vertsize, usage, fvf, D3DPOOL_MANAGED, &vbo, NULL))) {
+        if (FAILED(IDirect3DDevice9_CreateVertexBuffer(data->device, (UINT) vertsize, usage, fvf, D3DPOOL_DEFAULT, &vbo, NULL))) {
             vbo = NULL;
         }
         data->vertexBuffers[vboidx] = vbo;
@@ -1550,6 +1550,13 @@
                 data->shaders[i] = NULL;
             }
         }
+        /* Release all vertex buffers */
+        for (i = 0; i < SDL_arraysize(data->vertexBuffers); ++i) {
+            if (data->vertexBuffers[i]) {
+                IDirect3DVertexBuffer9_Release(data->vertexBuffers[i]);
+            }
+            data->vertexBuffers[i] = NULL;
+        }
         if (data->device) {
             IDirect3DDevice9_Release(data->device);
             data->device = NULL;
@@ -1591,7 +1598,7 @@
         }
     }
 
-	/* Release all vertex buffers */
+    /* Release all vertex buffers */
     for (i = 0; i < SDL_arraysize(data->vertexBuffers); ++i) {
         if (data->vertexBuffers[i]) {
             IDirect3DVertexBuffer9_Release(data->vertexBuffers[i]);