Merge "Don't let mBufferSize fall out of sync with the actual buffer size. …

Merge "Don't let mBufferSize fall out of sync with the actual buffer size. Pervents unnecessary buffer re-creations." into es3proto

Merge "Don't let mBufferSize fall out of sync with the actual buffer size. …
00a8465b · Geoff Lang · Gerrit Code Review · a621c2e4 · 453aaba4 · 00a8465b
Commit 00a8465b authored Nov 20, 2013 by Geoff Lang Committed by Gerrit Code Review Nov 20, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

BufferStorage11.cpp src/libGLESv2/renderer/d3d11/BufferStorage11.cpp +0 -4

No files found.
--- a/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp
+++ b/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp
@@ -354,10 +354,6 @@ bool DirectBufferStorage11::updateFromStagingBuffer(ID3D11Buffer *stagingBuffer,

        mBufferSize = bufferDesc.ByteWidth;
    }
-    else
-    {
-        mBufferSize = requiredBufferSize;
-    }

    // Copy data via staging buffer
    D3D11_BOX srcBox;