Commit f03bcad6 by Jamie Madill

Clean up the style in Buffer11.cpp.

Fix indentation, and simplify the naming scheme for the storage. Also add some missing DISALLOW_COPY_AND_ASSIGN macros. BUG=angle:912 Change-Id: I7ac36d8185ce926999501358cec222154d9a3492 Reviewed-on: https://chromium-review.googlesource.com/249180Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 1033e1d8
...@@ -74,16 +74,16 @@ class Buffer11 : public BufferD3D ...@@ -74,16 +74,16 @@ class Buffer11 : public BufferD3D
private: private:
DISALLOW_COPY_AND_ASSIGN(Buffer11); DISALLOW_COPY_AND_ASSIGN(Buffer11);
class BufferStorage11; class BufferStorage;
class NativeBuffer11; class NativeStorage;
class PackStorage11; class PackStorage;
Renderer11 *mRenderer; Renderer11 *mRenderer;
size_t mSize; size_t mSize;
BufferStorage11 *mMappedStorage; BufferStorage *mMappedStorage;
std::map<BufferUsage, BufferStorage11*> mBufferStorages; std::map<BufferUsage, BufferStorage*> mBufferStorages;
typedef std::pair<ID3D11Buffer *, ID3D11ShaderResourceView *> BufferSRVPair; typedef std::pair<ID3D11Buffer *, ID3D11ShaderResourceView *> BufferSRVPair;
std::map<DXGI_FORMAT, BufferSRVPair> mBufferResourceViews; std::map<DXGI_FORMAT, BufferSRVPair> mBufferResourceViews;
...@@ -93,11 +93,11 @@ class Buffer11 : public BufferD3D ...@@ -93,11 +93,11 @@ class Buffer11 : public BufferD3D
unsigned int mReadUsageCount; unsigned int mReadUsageCount;
void markBufferUsage(); void markBufferUsage();
NativeBuffer11 *getStagingBuffer(); NativeStorage *getStagingStorage();
PackStorage11 *getPackStorage(); PackStorage *getPackStorage();
BufferStorage11 *getBufferStorage(BufferUsage usage); BufferStorage *getBufferStorage(BufferUsage usage);
BufferStorage11 *getLatestBufferStorage() const; BufferStorage *getLatestBufferStorage() const;
}; };
} }
......
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