Added an additional null check in VertexBuffer9::discard.

TRAC #22227 Signed-off-by: Daniel Koch Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1599 736b8ea6-26fd-11df-bfd4-992fa37f6226

Added an additional null check in VertexBuffer9::discard.
097674f8 · daniel@transgaming.com · 2c4d070c · 097674f8
Commit 097674f8 authored Dec 20, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 13 deletions

VertexBuffer9.cpp src/libGLESv2/renderer/VertexBuffer9.cpp +21 -13

No files found.
--- a/src/libGLESv2/renderer/VertexBuffer9.cpp
+++ b/src/libGLESv2/renderer/VertexBuffer9.cpp
@@ -198,24 +198,32 @@ bool VertexBuffer9::setBufferSize(unsigned int size)

 bool VertexBuffer9::discard()
 {
-    void *dummy;
-    HRESULT result;
-
-    result = mVertexBuffer->Lock(0, 1, &dummy, D3DLOCK_DISCARD);
-    if (FAILED(result))
+    if (mVertexBuffer)
    {
-        ERR("Discard lock failed with error 0x%08x", result);
-        return false;
-    }
+        void *dummy;
+        HRESULT result;
+
+        result = mVertexBuffer->Lock(0, 1, &dummy, D3DLOCK_DISCARD);
+        if (FAILED(result))
+        {
+            ERR("Discard lock failed with error 0x%08x", result);
+            return false;
+        }
+
+        result = mVertexBuffer->Unlock();
+        if (FAILED(result))
+        {
+            ERR("Discard unlock failed with error 0x%08x", result);
+            return false;
+        }

-    result = mVertexBuffer->Unlock();
-    if (FAILED(result))
+        return true;
+    }
+    else
    {
-        ERR("Discard unlock failed with error 0x%08x", result);
+        ERR("Vertex buffer not initialized.");
        return false;
    }
-
-    return true;
 }

 IDirect3DVertexBuffer9 * VertexBuffer9::getBuffer() const