Fixed a bug where BufferStorage11 was unable to handle NULL data being set.

TRAC #22811 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2135 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed a bug where BufferStorage11 was unable to handle NULL data being set.
8132dae9 · shannon.woods%transgaming.com@gtempaccount.com · 296c3f25 · 8132dae9
Commit 8132dae9 authored Apr 13, 2013 by shannon.woods%transgaming.com@gtempaccount.com
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 10 deletions

BufferStorage11.cpp src/libGLESv2/renderer/BufferStorage11.cpp +26 -10

No files found.
--- a/src/libGLESv2/renderer/BufferStorage11.cpp
+++ b/src/libGLESv2/renderer/BufferStorage11.cpp
@@ -160,12 +160,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int 
            bufferDesc.MiscFlags = 0;
            bufferDesc.StructureByteStride = 0;
-            D3D11_SUBRESOURCE_DATA initialData;
+            if (data)
-            initialData.pSysMem = data;
+            {
-            initialData.SysMemPitch = size;
+                D3D11_SUBRESOURCE_DATA initialData;
-            initialData.SysMemSlicePitch = 0;
+                initialData.pSysMem = data;
+                initialData.SysMemPitch = size;
+                initialData.SysMemSlicePitch = 0;
+                result = device->CreateBuffer(&bufferDesc, &initialData, &mStagingBuffer);
+            }
+            else
+            {
+                result = device->CreateBuffer(&bufferDesc, NULL, &mStagingBuffer);
+            }
-            result = device->CreateBuffer(&bufferDesc, &initialData, &mStagingBuffer);
            if (FAILED(result))
            {
                return gl::error(GL_OUT_OF_MEMORY);
@@ -211,12 +219,20 @@ void BufferStorage11::setData(const void* data, unsigned int size, unsigned int 
                mBufferSize = 0;
            }
-            D3D11_SUBRESOURCE_DATA initialData;
+            if (data)
-            initialData.pSysMem = data;
+            {
-            initialData.SysMemPitch = size;
+                D3D11_SUBRESOURCE_DATA initialData;
-            initialData.SysMemSlicePitch = 0;
+                initialData.pSysMem = data;
+                initialData.SysMemPitch = size;
+                initialData.SysMemSlicePitch = 0;
+                result = device->CreateBuffer(&bufferDesc, &initialData, &mBuffer);
+            }
+            else
+            {
+                result = device->CreateBuffer(&bufferDesc, NULL, &mBuffer);
+            }
-            result = device->CreateBuffer(&bufferDesc, &initialData, &mBuffer);
            if (FAILED(result))
            {
                return gl::error(GL_OUT_OF_MEMORY);