Commit d8d58301 by Nico Weber Committed by Jamie Madill

Make Buffer11.cpp build with clang.

Change-Id: If72bc38dbb484e56a0a26c3aa7ac38bbc319653a Reviewed-on: https://chromium-review.googlesource.com/249921Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent ff805cc3
...@@ -91,7 +91,7 @@ class Buffer11::BufferStorage ...@@ -91,7 +91,7 @@ class Buffer11::BufferStorage
virtual void unmap() = 0; virtual void unmap() = 0;
protected: protected:
DISALLOW_COPY_AND_ASSIGN(Buffer11::BufferStorage); DISALLOW_COPY_AND_ASSIGN(BufferStorage);
BufferStorage(Renderer11 *renderer, BufferUsage usage); BufferStorage(Renderer11 *renderer, BufferUsage usage);
...@@ -121,7 +121,7 @@ class Buffer11::NativeStorage : public Buffer11::BufferStorage ...@@ -121,7 +121,7 @@ class Buffer11::NativeStorage : public Buffer11::BufferStorage
gl::Error setData(D3D11_MAP mapMode, const uint8_t *data, size_t size, size_t offset); gl::Error setData(D3D11_MAP mapMode, const uint8_t *data, size_t size, size_t offset);
private: private:
DISALLOW_COPY_AND_ASSIGN(Buffer11::NativeStorage); DISALLOW_COPY_AND_ASSIGN(NativeStorage);
static void fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Renderer11 *renderer, BufferUsage usage, unsigned int bufferSize); static void fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Renderer11 *renderer, BufferUsage usage, unsigned int bufferSize);
...@@ -146,7 +146,7 @@ class Buffer11::PackStorage : public Buffer11::BufferStorage ...@@ -146,7 +146,7 @@ class Buffer11::PackStorage : public Buffer11::BufferStorage
gl::Error packPixels(ID3D11Texture2D *srcTexure, UINT srcSubresource, const PackPixelsParams &params); gl::Error packPixels(ID3D11Texture2D *srcTexure, UINT srcSubresource, const PackPixelsParams &params);
private: private:
DISALLOW_COPY_AND_ASSIGN(Buffer11::PackStorage); DISALLOW_COPY_AND_ASSIGN(PackStorage);
gl::Error flushQueuedPackCommand(); gl::Error flushQueuedPackCommand();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment