D3D: Speculative fix for VertexBuffer crash.

It's possible we were triggering a null pointer dereference in some cases of lost device recovery. I was unable to reproduce this in a test so this fix is speculative. Bug: chromium:871178 Change-Id: I55b7790eabb81c25489bdfd105b5f2cbeedcc8db Reviewed-on: https://chromium-review.googlesource.com/1169955Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

D3D: Speculative fix for VertexBuffer crash.
9b6a3f92 · Jamie Madill · Commit Bot · 6c43a01a · 9b6a3f92
Commit 9b6a3f92 authored Aug 09, 2018 by Jamie Madill Committed by Commit Bot Aug 09, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

VertexBuffer.cpp src/libANGLE/renderer/d3d/VertexBuffer.cpp +6 -1

No files found.
--- a/src/libANGLE/renderer/d3d/VertexBuffer.cpp
+++ b/src/libANGLE/renderer/d3d/VertexBuffer.cpp
@@ -72,16 +72,19 @@ VertexBufferInterface::~VertexBufferInterface()

 unsigned int VertexBufferInterface::getSerial() const
 {
+    ASSERT(mVertexBuffer);
    return mVertexBuffer->getSerial();
 }

 unsigned int VertexBufferInterface::getBufferSize() const
 {
+    ASSERT(mVertexBuffer);
    return mVertexBuffer->getBufferSize();
 }

 gl::Error VertexBufferInterface::setBufferSize(const gl::Context *context, unsigned int size)
 {
+    ASSERT(mVertexBuffer);
    if (mVertexBuffer->getBufferSize() == 0)
    {
        return mVertexBuffer->initialize(context, size, mDynamic);
@@ -116,11 +119,13 @@ gl::Error VertexBufferInterface::getSpaceRequired(const gl::Context *context,

 gl::Error VertexBufferInterface::discard(const gl::Context *context)
 {
+    ASSERT(mVertexBuffer);
    return mVertexBuffer->discard(context);
 }

 VertexBuffer *VertexBufferInterface::getVertexBuffer() const
 {
+    ASSERT(mVertexBuffer);
    return mVertexBuffer;
 }

@@ -141,7 +146,7 @@ void StreamingVertexBufferInterface::reset()
    if (mVertexBuffer)
    {
        mVertexBuffer->release();
-        mVertexBuffer = nullptr;
+        mVertexBuffer = mFactory->createVertexBuffer();
    }
 }