Skip to content

A
angle
Commit bea35130 by Jamie Madill
Options

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/252960Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 459f2e5e
Showing with 130 additions and 127 deletions
src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
...@@ -66,15 +66,15 @@ D3D11_MAP GetD3DMapTypeFromBits(GLbitfield access) ...@@ -66,15 +66,15 @@ D3D11_MAP GetD3DMapTypeFromBits(GLbitfield access)
} }
// Each instance of Buffer11::BufferStorage11 is specialized for a class of D3D binding points // Each instance of Buffer11::BufferStorage is specialized for a class of D3D binding points
// - vertex/transform feedback buffers // - vertex/transform feedback buffers
// - index buffers // - index buffers
// - pixel unpack buffers // - pixel unpack buffers
// - uniform buffers // - uniform buffers
class Buffer11::BufferStorage11 class Buffer11::BufferStorage
{ {
public: public:
virtual ~BufferStorage11() {} virtual ~BufferStorage() {}
DataRevision getDataRevision() const { return mRevision; } DataRevision getDataRevision() const { return mRevision; }
BufferUsage getUsage() const { return mUsage; } BufferUsage getUsage() const { return mUsage; }
...@@ -83,15 +83,17 @@ class Buffer11::BufferStorage11 ...@@ -83,15 +83,17 @@ class Buffer11::BufferStorage11
void setDataRevision(DataRevision rev) { mRevision = rev; } void setDataRevision(DataRevision rev) { mRevision = rev; }
virtual bool copyFromStorage(BufferStorage11 *source, size_t sourceOffset, virtual bool copyFromStorage(BufferStorage *source, size_t sourceOffset,
size_t size, size_t destOffset) = 0; size_t size, size_t destOffset) = 0;
virtual gl::Error resize(size_t size, bool preserveData) = 0; virtual gl::Error resize(size_t size, bool preserveData) = 0;
virtual void *map(size_t offset, size_t length, GLbitfield access) = 0; virtual uint8_t *map(size_t offset, size_t length, GLbitfield access) = 0;
virtual void unmap() = 0; virtual void unmap() = 0;
protected: protected:
BufferStorage11(Renderer11 *renderer, BufferUsage usage); DISALLOW_COPY_AND_ASSIGN(BufferStorage);
BufferStorage(Renderer11 *renderer, BufferUsage usage);
Renderer11 *mRenderer; Renderer11 *mRenderer;
DataRevision mRevision; DataRevision mRevision;
...@@ -101,47 +103,50 @@ class Buffer11::BufferStorage11 ...@@ -101,47 +103,50 @@ class Buffer11::BufferStorage11
// A native buffer storage represents an underlying D3D11 buffer for a particular // A native buffer storage represents an underlying D3D11 buffer for a particular
// type of storage. // type of storage.
class Buffer11::NativeBuffer11 : public Buffer11::BufferStorage11 class Buffer11::NativeStorage : public Buffer11::BufferStorage
{ {
public: public:
NativeBuffer11(Renderer11 *renderer, BufferUsage usage); NativeStorage(Renderer11 *renderer, BufferUsage usage);
~NativeBuffer11(); ~NativeStorage() override;
ID3D11Buffer *getNativeBuffer() const { return mNativeBuffer; } ID3D11Buffer *getNativeStorage() const { return mNativeStorage; }
virtual bool copyFromStorage(BufferStorage11 *source, size_t sourceOffset, bool copyFromStorage(BufferStorage *source, size_t sourceOffset,
size_t size, size_t destOffset); size_t size, size_t destOffset) override;
virtual gl::Error resize(size_t size, bool preserveData); gl::Error resize(size_t size, bool preserveData) override;
virtual void *map(size_t offset, size_t length, GLbitfield access); uint8_t *map(size_t offset, size_t length, GLbitfield access) override;
virtual void unmap(); void unmap() override;
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:
ID3D11Buffer *mNativeBuffer; 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);
ID3D11Buffer *mNativeStorage;
}; };
// Pack storage represents internal storage for pack buffers. We implement pack buffers // Pack storage represents internal storage for pack buffers. We implement pack buffers
// as CPU memory, tied to a staging texture, for asynchronous texture readback. // as CPU memory, tied to a staging texture, for asynchronous texture readback.
class Buffer11::PackStorage11 : public Buffer11::BufferStorage11 class Buffer11::PackStorage : public Buffer11::BufferStorage
{ {
public: public:
PackStorage11(Renderer11 *renderer); PackStorage(Renderer11 *renderer);
~PackStorage11(); ~PackStorage() override;
virtual bool copyFromStorage(BufferStorage11 *source, size_t sourceOffset, bool copyFromStorage(BufferStorage *source, size_t sourceOffset,
size_t size, size_t destOffset); size_t size, size_t destOffset) override;
virtual gl::Error resize(size_t size, bool preserveData); gl::Error resize(size_t size, bool preserveData) override;
virtual void *map(size_t offset, size_t length, GLbitfield access); uint8_t *map(size_t offset, size_t length, GLbitfield access) override;
virtual void unmap(); void unmap() override;
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(PackStorage);
gl::Error flushQueuedPackCommand(); gl::Error flushQueuedPackCommand();
...@@ -154,7 +159,6 @@ class Buffer11::PackStorage11 : public Buffer11::BufferStorage11 ...@@ -154,7 +159,6 @@ class Buffer11::PackStorage11 : public Buffer11::BufferStorage11
bool mDataModified; bool mDataModified;
}; };
Buffer11::Buffer11(Renderer11 *renderer) Buffer11::Buffer11(Renderer11 *renderer)
: BufferD3D(), : BufferD3D(),
mRenderer(renderer), mRenderer(renderer),
...@@ -196,7 +200,7 @@ gl::Error Buffer11::setData(const void *data, size_t size, GLenum usage) ...@@ -196,7 +200,7 @@ gl::Error Buffer11::setData(const void *data, size_t size, GLenum usage)
gl::Error Buffer11::getData(const uint8_t **outData) gl::Error Buffer11::getData(const uint8_t **outData)
{ {
NativeBuffer11 *stagingBuffer = getStagingBuffer(); NativeStorage *stagingBuffer = getStagingStorage();
if (!stagingBuffer) if (!stagingBuffer)
{ {
...@@ -217,7 +221,7 @@ gl::Error Buffer11::getData(const uint8_t **outData) ...@@ -217,7 +221,7 @@ gl::Error Buffer11::getData(const uint8_t **outData)
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
D3D11_MAPPED_SUBRESOURCE mappedResource; D3D11_MAPPED_SUBRESOURCE mappedResource;
HRESULT result = context->Map(stagingBuffer->getNativeBuffer(), 0, D3D11_MAP_READ, 0, &mappedResource); HRESULT result = context->Map(stagingBuffer->getNativeStorage(), 0, D3D11_MAP_READ, 0, &mappedResource);
if (FAILED(result)) if (FAILED(result))
{ {
return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer, result: 0x%X.", result); return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer, result: 0x%X.", result);
...@@ -225,7 +229,7 @@ gl::Error Buffer11::getData(const uint8_t **outData) ...@@ -225,7 +229,7 @@ gl::Error Buffer11::getData(const uint8_t **outData)
memcpy(mResolvedData.data(), mappedResource.pData, stagingBuffer->getSize()); memcpy(mResolvedData.data(), mappedResource.pData, stagingBuffer->getSize());
context->Unmap(stagingBuffer->getNativeBuffer(), 0); context->Unmap(stagingBuffer->getNativeStorage(), 0);
mResolvedDataRevision = stagingBuffer->getDataRevision(); mResolvedDataRevision = stagingBuffer->getDataRevision();
} }
...@@ -253,7 +257,7 @@ gl::Error Buffer11::setSubData(const void *data, size_t size, size_t offset) ...@@ -253,7 +257,7 @@ gl::Error Buffer11::setSubData(const void *data, size_t size, size_t offset)
if (data && size > 0) if (data && size > 0)
{ {
NativeBuffer11 *stagingBuffer = getStagingBuffer(); NativeStorage *stagingBuffer = getStagingStorage();
if (!stagingBuffer) if (!stagingBuffer)
{ {
...@@ -292,13 +296,13 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint ...@@ -292,13 +296,13 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint
Buffer11 *sourceBuffer = makeBuffer11(source); Buffer11 *sourceBuffer = makeBuffer11(source);
ASSERT(sourceBuffer != NULL); ASSERT(sourceBuffer != NULL);
BufferStorage11 *copyDest = getLatestBufferStorage(); BufferStorage *copyDest = getLatestBufferStorage();
if (!copyDest) if (!copyDest)
{ {
copyDest = getStagingBuffer(); copyDest = getStagingStorage();
} }
BufferStorage11 *copySource = sourceBuffer->getLatestBufferStorage(); BufferStorage *copySource = sourceBuffer->getLatestBufferStorage();
if (!copySource || !copyDest) if (!copySource || !copyDest)
{ {
...@@ -309,11 +313,11 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint ...@@ -309,11 +313,11 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint
// pack buffer partner, because other native buffers can't be mapped // pack buffer partner, because other native buffers can't be mapped
if (copyDest->getUsage() == BUFFER_USAGE_PIXEL_PACK && !copySource->isMappable()) if (copyDest->getUsage() == BUFFER_USAGE_PIXEL_PACK && !copySource->isMappable())
{ {
copySource = sourceBuffer->getStagingBuffer(); copySource = sourceBuffer->getStagingStorage();
} }
else if (copySource->getUsage() == BUFFER_USAGE_PIXEL_PACK && !copyDest->isMappable()) else if (copySource->getUsage() == BUFFER_USAGE_PIXEL_PACK && !copyDest->isMappable())
{ {
copyDest = getStagingBuffer(); copyDest = getStagingStorage();
} }
// D3D11 does not allow overlapped copies until 11.1, and only if the // D3D11 does not allow overlapped copies until 11.1, and only if the
...@@ -327,7 +331,7 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint ...@@ -327,7 +331,7 @@ gl::Error Buffer11::copySubData(BufferImpl* source, GLintptr sourceOffset, GLint
} }
else else
{ {
copySource = getStagingBuffer(); copySource = getStagingStorage();
} }
} }
...@@ -344,7 +348,7 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid ...@@ -344,7 +348,7 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid
{ {
ASSERT(!mMappedStorage); ASSERT(!mMappedStorage);
BufferStorage11 *latestStorage = getLatestBufferStorage(); BufferStorage *latestStorage = getLatestBufferStorage();
if (latestStorage && if (latestStorage &&
(latestStorage->getUsage() == BUFFER_USAGE_PIXEL_PACK || (latestStorage->getUsage() == BUFFER_USAGE_PIXEL_PACK ||
latestStorage->getUsage() == BUFFER_USAGE_STAGING)) latestStorage->getUsage() == BUFFER_USAGE_STAGING))
...@@ -356,7 +360,7 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid ...@@ -356,7 +360,7 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid
{ {
// Fall back to using the staging buffer if the latest storage does // Fall back to using the staging buffer if the latest storage does
// not exist or is not CPU-accessible. // not exist or is not CPU-accessible.
mMappedStorage = getStagingBuffer(); mMappedStorage = getStagingStorage();
} }
if (!mMappedStorage) if (!mMappedStorage)
...@@ -370,13 +374,13 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid ...@@ -370,13 +374,13 @@ gl::Error Buffer11::map(size_t offset, size_t length, GLbitfield access, GLvoid
mMappedStorage->setDataRevision(mMappedStorage->getDataRevision() + 1); mMappedStorage->setDataRevision(mMappedStorage->getDataRevision() + 1);
} }
void *mappedBuffer = mMappedStorage->map(offset, length, access); uint8_t *mappedBuffer = mMappedStorage->map(offset, length, access);
if (!mappedBuffer) if (!mappedBuffer)
{ {
return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer."); return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer.");
} }
*mapPtr = mappedBuffer; *mapPtr = static_cast<GLvoid *>(mappedBuffer);
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
...@@ -390,7 +394,7 @@ gl::Error Buffer11::unmap() ...@@ -390,7 +394,7 @@ gl::Error Buffer11::unmap()
void Buffer11::markTransformFeedbackUsage() void Buffer11::markTransformFeedbackUsage()
{ {
BufferStorage11 *transformFeedbackStorage = getBufferStorage(BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK); BufferStorage *transformFeedbackStorage = getBufferStorage(BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK);
if (transformFeedbackStorage) if (transformFeedbackStorage)
{ {
...@@ -422,7 +426,7 @@ ID3D11Buffer *Buffer11::getBuffer(BufferUsage usage) ...@@ -422,7 +426,7 @@ ID3D11Buffer *Buffer11::getBuffer(BufferUsage usage)
{ {
markBufferUsage(); markBufferUsage();
BufferStorage11 *bufferStorage = getBufferStorage(usage); BufferStorage *bufferStorage = getBufferStorage(usage);
if (!bufferStorage) if (!bufferStorage)
{ {
...@@ -430,14 +434,14 @@ ID3D11Buffer *Buffer11::getBuffer(BufferUsage usage) ...@@ -430,14 +434,14 @@ ID3D11Buffer *Buffer11::getBuffer(BufferUsage usage)
return NULL; return NULL;
} }
ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, bufferStorage)); ASSERT(HAS_DYNAMIC_TYPE(NativeStorage*, bufferStorage));
return static_cast<NativeBuffer11*>(bufferStorage)->getNativeBuffer(); return static_cast<NativeStorage*>(bufferStorage)->getNativeStorage();
} }
ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat) ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat)
{ {
BufferStorage11 *storage = getBufferStorage(BUFFER_USAGE_PIXEL_UNPACK); BufferStorage *storage = getBufferStorage(BUFFER_USAGE_PIXEL_UNPACK);
if (!storage) if (!storage)
{ {
...@@ -445,8 +449,8 @@ ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat) ...@@ -445,8 +449,8 @@ ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat)
return NULL; return NULL;
} }
ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, storage)); ASSERT(HAS_DYNAMIC_TYPE(NativeStorage*, storage));
ID3D11Buffer *buffer = static_cast<NativeBuffer11*>(storage)->getNativeBuffer(); ID3D11Buffer *buffer = static_cast<NativeStorage*>(storage)->getNativeStorage();
auto bufferSRVIt = mBufferResourceViews.find(srvFormat); auto bufferSRVIt = mBufferResourceViews.find(srvFormat);
...@@ -485,9 +489,8 @@ ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat) ...@@ -485,9 +489,8 @@ ID3D11ShaderResourceView *Buffer11::getSRV(DXGI_FORMAT srvFormat)
gl::Error Buffer11::packPixels(ID3D11Texture2D *srcTexture, UINT srcSubresource, const PackPixelsParams &params) gl::Error Buffer11::packPixels(ID3D11Texture2D *srcTexture, UINT srcSubresource, const PackPixelsParams &params)
{ {
PackStorage11 *packStorage = getPackStorage(); PackStorage *packStorage = getPackStorage();
BufferStorage *latestStorage = getLatestBufferStorage();
BufferStorage11 *latestStorage = getLatestBufferStorage();
if (packStorage) if (packStorage)
{ {
...@@ -502,76 +505,76 @@ gl::Error Buffer11::packPixels(ID3D11Texture2D *srcTexture, UINT srcSubresource, ...@@ -502,76 +505,76 @@ gl::Error Buffer11::packPixels(ID3D11Texture2D *srcTexture, UINT srcSubresource,
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
Buffer11::BufferStorage11 *Buffer11::getBufferStorage(BufferUsage usage) Buffer11::BufferStorage *Buffer11::getBufferStorage(BufferUsage usage)
{ {
BufferStorage11 *directBuffer = NULL; BufferStorage *newStorage = NULL;
auto directBufferIt = mBufferStorages.find(usage); auto directBufferIt = mBufferStorages.find(usage);
if (directBufferIt != mBufferStorages.end()) if (directBufferIt != mBufferStorages.end())
{ {
directBuffer = directBufferIt->second; newStorage = directBufferIt->second;
} }
if (!directBuffer) if (!newStorage)
{ {
if (usage == BUFFER_USAGE_PIXEL_PACK) if (usage == BUFFER_USAGE_PIXEL_PACK)
{ {
directBuffer = new PackStorage11(mRenderer); newStorage = new PackStorage(mRenderer);
} }
else else
{ {
// buffer is not allocated, create it // buffer is not allocated, create it
directBuffer = new NativeBuffer11(mRenderer, usage); newStorage = new NativeStorage(mRenderer, usage);
} }
mBufferStorages.insert(std::make_pair(usage, directBuffer)); mBufferStorages.insert(std::make_pair(usage, newStorage));
} }
// resize buffer // resize buffer
if (directBuffer->getSize() < mSize) if (newStorage->getSize() < mSize)
{ {
if (directBuffer->resize(mSize, true).isError()) if (newStorage->resize(mSize, true).isError())
{ {
// Out of memory error // Out of memory error
return NULL; return NULL;
} }
} }
BufferStorage11 *latestBuffer = getLatestBufferStorage(); BufferStorage *latestBuffer = getLatestBufferStorage();
if (latestBuffer && latestBuffer->getDataRevision() > directBuffer->getDataRevision()) if (latestBuffer && latestBuffer->getDataRevision() > newStorage->getDataRevision())
{ {
// if copying from a pack buffer to a non-staging native buffer, we must first // if copying from a pack buffer to a non-staging native buffer, we must first
// copy through the staging buffer, because other native buffers can't be mapped // copy through the staging buffer, because other native buffers can't be mapped
if (latestBuffer->getUsage() == BUFFER_USAGE_PIXEL_PACK && !directBuffer->isMappable()) if (latestBuffer->getUsage() == BUFFER_USAGE_PIXEL_PACK && !newStorage->isMappable())
{ {
NativeBuffer11 *stagingBuffer = getStagingBuffer(); NativeStorage *stagingBuffer = getStagingStorage();
stagingBuffer->copyFromStorage(latestBuffer, 0, latestBuffer->getSize(), 0); stagingBuffer->copyFromStorage(latestBuffer, 0, latestBuffer->getSize(), 0);
directBuffer->setDataRevision(latestBuffer->getDataRevision()); newStorage->setDataRevision(latestBuffer->getDataRevision());
latestBuffer = stagingBuffer; latestBuffer = stagingBuffer;
} }
// if copyFromStorage returns true, the D3D buffer has been recreated // if copyFromStorage returns true, the D3D buffer has been recreated
// and we should update our serial // and we should update our serial
if (directBuffer->copyFromStorage(latestBuffer, 0, latestBuffer->getSize(), 0)) if (newStorage->copyFromStorage(latestBuffer, 0, latestBuffer->getSize(), 0))
{ {
updateSerial(); updateSerial();
} }
directBuffer->setDataRevision(latestBuffer->getDataRevision()); newStorage->setDataRevision(latestBuffer->getDataRevision());
} }
return directBuffer; return newStorage;
} }
Buffer11::BufferStorage11 *Buffer11::getLatestBufferStorage() const Buffer11::BufferStorage *Buffer11::getLatestBufferStorage() const
{ {
// Even though we iterate over all the direct buffers, it is expected that only // Even though we iterate over all the direct buffers, it is expected that only
// 1 or 2 will be present. // 1 or 2 will be present.
BufferStorage11 *latestStorage = NULL; BufferStorage *latestStorage = NULL;
DataRevision latestRevision = 0; DataRevision latestRevision = 0;
for (auto it = mBufferStorages.begin(); it != mBufferStorages.end(); it++) for (auto it = mBufferStorages.begin(); it != mBufferStorages.end(); it++)
{ {
BufferStorage11 *storage = it->second; BufferStorage *storage = it->second;
if (!latestStorage || storage->getDataRevision() > latestRevision) if (!latestStorage || storage->getDataRevision() > latestRevision)
{ {
latestStorage = storage; latestStorage = storage;
...@@ -582,9 +585,9 @@ Buffer11::BufferStorage11 *Buffer11::getLatestBufferStorage() const ...@@ -582,9 +585,9 @@ Buffer11::BufferStorage11 *Buffer11::getLatestBufferStorage() const
return latestStorage; return latestStorage;
} }
Buffer11::NativeBuffer11 *Buffer11::getStagingBuffer() Buffer11::NativeStorage *Buffer11::getStagingStorage()
{ {
BufferStorage11 *stagingStorage = getBufferStorage(BUFFER_USAGE_STAGING); BufferStorage *stagingStorage = getBufferStorage(BUFFER_USAGE_STAGING);
if (!stagingStorage) if (!stagingStorage)
{ {
...@@ -592,13 +595,13 @@ Buffer11::NativeBuffer11 *Buffer11::getStagingBuffer() ...@@ -592,13 +595,13 @@ Buffer11::NativeBuffer11 *Buffer11::getStagingBuffer()
return NULL; return NULL;
} }
ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, stagingStorage)); ASSERT(HAS_DYNAMIC_TYPE(NativeStorage*, stagingStorage));
return static_cast<NativeBuffer11*>(stagingStorage); return static_cast<NativeStorage*>(stagingStorage);
} }
Buffer11::PackStorage11 *Buffer11::getPackStorage() Buffer11::PackStorage *Buffer11::getPackStorage()
{ {
BufferStorage11 *packStorage = getBufferStorage(BUFFER_USAGE_PIXEL_PACK); BufferStorage *packStorage = getBufferStorage(BUFFER_USAGE_PIXEL_PACK);
if (!packStorage) if (!packStorage)
{ {
...@@ -606,8 +609,8 @@ Buffer11::PackStorage11 *Buffer11::getPackStorage() ...@@ -606,8 +609,8 @@ Buffer11::PackStorage11 *Buffer11::getPackStorage()
return NULL; return NULL;
} }
ASSERT(HAS_DYNAMIC_TYPE(PackStorage11*, packStorage)); ASSERT(HAS_DYNAMIC_TYPE(PackStorage*, packStorage));
return static_cast<PackStorage11*>(packStorage); return static_cast<PackStorage*>(packStorage);
} }
bool Buffer11::supportsDirectBinding() const bool Buffer11::supportsDirectBinding() const
...@@ -618,7 +621,7 @@ bool Buffer11::supportsDirectBinding() const ...@@ -618,7 +621,7 @@ bool Buffer11::supportsDirectBinding() const
return (mStaticVertexBuffer && mStaticIndexBuffer); return (mStaticVertexBuffer && mStaticIndexBuffer);
} }
Buffer11::BufferStorage11::BufferStorage11(Renderer11 *renderer, BufferUsage usage) Buffer11::BufferStorage::BufferStorage(Renderer11 *renderer, BufferUsage usage)
: mRenderer(renderer), : mRenderer(renderer),
mUsage(usage), mUsage(usage),
mRevision(0), mRevision(0),
...@@ -626,25 +629,25 @@ Buffer11::BufferStorage11::BufferStorage11(Renderer11 *renderer, BufferUsage usa ...@@ -626,25 +629,25 @@ Buffer11::BufferStorage11::BufferStorage11(Renderer11 *renderer, BufferUsage usa
{ {
} }
Buffer11::NativeBuffer11::NativeBuffer11(Renderer11 *renderer, BufferUsage usage) Buffer11::NativeStorage::NativeStorage(Renderer11 *renderer, BufferUsage usage)
: BufferStorage11(renderer, usage), : BufferStorage(renderer, usage),
mNativeBuffer(NULL) mNativeStorage(NULL)
{ {
} }
Buffer11::NativeBuffer11::~NativeBuffer11() Buffer11::NativeStorage::~NativeStorage()
{ {
SafeRelease(mNativeBuffer); SafeRelease(mNativeStorage);
} }
// Returns true if it recreates the direct buffer // Returns true if it recreates the direct buffer
bool Buffer11::NativeBuffer11::copyFromStorage(BufferStorage11 *source, size_t sourceOffset, bool Buffer11::NativeStorage::copyFromStorage(BufferStorage *source, size_t sourceOffset,
size_t size, size_t destOffset) size_t size, size_t destOffset)
{ {
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
size_t requiredSize = sourceOffset + size; size_t requiredSize = sourceOffset + size;
bool createBuffer = !mNativeBuffer || mBufferSize < requiredSize; bool createBuffer = !mNativeStorage || mBufferSize < requiredSize;
// (Re)initialize D3D buffer if needed // (Re)initialize D3D buffer if needed
if (createBuffer) if (createBuffer)
...@@ -655,27 +658,27 @@ bool Buffer11::NativeBuffer11::copyFromStorage(BufferStorage11 *source, size_t s ...@@ -655,27 +658,27 @@ bool Buffer11::NativeBuffer11::copyFromStorage(BufferStorage11 *source, size_t s
if (source->getUsage() == BUFFER_USAGE_PIXEL_PACK) if (source->getUsage() == BUFFER_USAGE_PIXEL_PACK)
{ {
ASSERT(HAS_DYNAMIC_TYPE(PackStorage11*, source)); ASSERT(HAS_DYNAMIC_TYPE(PackStorage*, source));
void *sourcePointer = source->map(sourceOffset, size, GL_MAP_READ_BIT); uint8_t *sourcePointer = source->map(sourceOffset, size, GL_MAP_READ_BIT);
D3D11_MAPPED_SUBRESOURCE mappedResource; D3D11_MAPPED_SUBRESOURCE mappedResource;
HRESULT hr = context->Map(mNativeBuffer, 0, D3D11_MAP_WRITE, 0, &mappedResource); HRESULT hr = context->Map(mNativeStorage, 0, D3D11_MAP_WRITE, 0, &mappedResource);
UNUSED_ASSERTION_VARIABLE(hr); UNUSED_ASSERTION_VARIABLE(hr);
ASSERT(SUCCEEDED(hr)); ASSERT(SUCCEEDED(hr));
unsigned char *destPointer = static_cast<unsigned char *>(mappedResource.pData) + destOffset; uint8_t *destPointer = static_cast<uint8_t *>(mappedResource.pData) + destOffset;
// Offset bounds are validated at the API layer // Offset bounds are validated at the API layer
ASSERT(sourceOffset + size <= destOffset + mBufferSize); ASSERT(sourceOffset + size <= destOffset + mBufferSize);
memcpy(destPointer, sourcePointer, size); memcpy(destPointer, sourcePointer, size);
context->Unmap(mNativeBuffer, 0); context->Unmap(mNativeStorage, 0);
source->unmap(); source->unmap();
} }
else else
{ {
ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, source)); ASSERT(HAS_DYNAMIC_TYPE(NativeStorage*, source));
D3D11_BOX srcBox; D3D11_BOX srcBox;
srcBox.left = sourceOffset; srcBox.left = sourceOffset;
...@@ -685,16 +688,16 @@ bool Buffer11::NativeBuffer11::copyFromStorage(BufferStorage11 *source, size_t s ...@@ -685,16 +688,16 @@ bool Buffer11::NativeBuffer11::copyFromStorage(BufferStorage11 *source, size_t s
srcBox.front = 0; srcBox.front = 0;
srcBox.back = 1; srcBox.back = 1;
ASSERT(HAS_DYNAMIC_TYPE(NativeBuffer11*, source)); ASSERT(HAS_DYNAMIC_TYPE(NativeStorage*, source));
ID3D11Buffer *sourceBuffer = static_cast<NativeBuffer11*>(source)->getNativeBuffer(); ID3D11Buffer *sourceBuffer = static_cast<NativeStorage*>(source)->getNativeStorage();
context->CopySubresourceRegion(mNativeBuffer, 0, destOffset, 0, 0, sourceBuffer, 0, &srcBox); context->CopySubresourceRegion(mNativeStorage, 0, destOffset, 0, 0, sourceBuffer, 0, &srcBox);
} }
return createBuffer; return createBuffer;
} }
gl::Error Buffer11::NativeBuffer11::resize(size_t size, bool preserveData) gl::Error Buffer11::NativeStorage::resize(size_t size, bool preserveData)
{ {
ID3D11Device *device = mRenderer->getDevice(); ID3D11Device *device = mRenderer->getDevice();
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
...@@ -710,7 +713,7 @@ gl::Error Buffer11::NativeBuffer11::resize(size_t size, bool preserveData) ...@@ -710,7 +713,7 @@ gl::Error Buffer11::NativeBuffer11::resize(size_t size, bool preserveData)
return gl::Error(GL_OUT_OF_MEMORY, "Failed to create internal buffer, result: 0x%X.", result); return gl::Error(GL_OUT_OF_MEMORY, "Failed to create internal buffer, result: 0x%X.", result);
} }
if (mNativeBuffer && preserveData) if (mNativeStorage && preserveData)
{ {
// We don't call resize if the buffer is big enough already. // We don't call resize if the buffer is big enough already.
ASSERT(mBufferSize <= size); ASSERT(mBufferSize <= size);
...@@ -723,19 +726,19 @@ gl::Error Buffer11::NativeBuffer11::resize(size_t size, bool preserveData) ...@@ -723,19 +726,19 @@ gl::Error Buffer11::NativeBuffer11::resize(size_t size, bool preserveData)
srcBox.front = 0; srcBox.front = 0;
srcBox.back = 1; srcBox.back = 1;
context->CopySubresourceRegion(newBuffer, 0, 0, 0, 0, mNativeBuffer, 0, &srcBox); context->CopySubresourceRegion(newBuffer, 0, 0, 0, 0, mNativeStorage, 0, &srcBox);
} }
// No longer need the old buffer // No longer need the old buffer
SafeRelease(mNativeBuffer); SafeRelease(mNativeStorage);
mNativeBuffer = newBuffer; mNativeStorage = newBuffer;
mBufferSize = bufferDesc.ByteWidth; mBufferSize = bufferDesc.ByteWidth;
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
void Buffer11::NativeBuffer11::fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Renderer11 *renderer, void Buffer11::NativeStorage::fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Renderer11 *renderer,
BufferUsage usage, unsigned int bufferSize) BufferUsage usage, unsigned int bufferSize)
{ {
bufferDesc->ByteWidth = bufferSize; bufferDesc->ByteWidth = bufferSize;
...@@ -785,12 +788,12 @@ void Buffer11::NativeBuffer11::fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Ren ...@@ -785,12 +788,12 @@ void Buffer11::NativeBuffer11::fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, Ren
bufferDesc->ByteWidth = std::min<UINT>(bufferDesc->ByteWidth, renderer->getRendererCaps().maxUniformBlockSize); bufferDesc->ByteWidth = std::min<UINT>(bufferDesc->ByteWidth, renderer->getRendererCaps().maxUniformBlockSize);
break; break;
default: default:
UNREACHABLE(); UNREACHABLE();
} }
} }
void *Buffer11::NativeBuffer11::map(size_t offset, size_t length, GLbitfield access) uint8_t *Buffer11::NativeStorage::map(size_t offset, size_t length, GLbitfield access)
{ {
ASSERT(mUsage == BUFFER_USAGE_STAGING); ASSERT(mUsage == BUFFER_USAGE_STAGING);
...@@ -799,19 +802,19 @@ void *Buffer11::NativeBuffer11::map(size_t offset, size_t length, GLbitfield acc ...@@ -799,19 +802,19 @@ void *Buffer11::NativeBuffer11::map(size_t offset, size_t length, GLbitfield acc
D3D11_MAP d3dMapType = gl_d3d11::GetD3DMapTypeFromBits(access); D3D11_MAP d3dMapType = gl_d3d11::GetD3DMapTypeFromBits(access);
UINT d3dMapFlag = ((access & GL_MAP_UNSYNCHRONIZED_BIT) != 0 ? D3D11_MAP_FLAG_DO_NOT_WAIT : 0); UINT d3dMapFlag = ((access & GL_MAP_UNSYNCHRONIZED_BIT) != 0 ? D3D11_MAP_FLAG_DO_NOT_WAIT : 0);
HRESULT result = context->Map(mNativeBuffer, 0, d3dMapType, d3dMapFlag, &mappedResource); HRESULT result = context->Map(mNativeStorage, 0, d3dMapType, d3dMapFlag, &mappedResource);
UNUSED_ASSERTION_VARIABLE(result); UNUSED_ASSERTION_VARIABLE(result);
ASSERT(SUCCEEDED(result)); ASSERT(SUCCEEDED(result));
return static_cast<GLubyte*>(mappedResource.pData) + offset; return static_cast<uint8_t*>(mappedResource.pData) + offset;
} }
gl::Error Buffer11::NativeBuffer11::setData(D3D11_MAP mapMode, const uint8_t *data, size_t size, size_t offset) gl::Error Buffer11::NativeStorage::setData(D3D11_MAP mapMode, const uint8_t *data, size_t size, size_t offset)
{ {
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
D3D11_MAPPED_SUBRESOURCE mappedResource; D3D11_MAPPED_SUBRESOURCE mappedResource;
HRESULT result = context->Map(mNativeBuffer, 0, mapMode, 0, &mappedResource); HRESULT result = context->Map(mNativeStorage, 0, mapMode, 0, &mappedResource);
if (FAILED(result)) if (FAILED(result))
{ {
return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer, result: 0x%X.", result); return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal buffer, result: 0x%X.", result);
...@@ -820,20 +823,20 @@ gl::Error Buffer11::NativeBuffer11::setData(D3D11_MAP mapMode, const uint8_t *da ...@@ -820,20 +823,20 @@ gl::Error Buffer11::NativeBuffer11::setData(D3D11_MAP mapMode, const uint8_t *da
uint8_t *offsetBufferPointer = reinterpret_cast<uint8_t *>(mappedResource.pData) + offset; uint8_t *offsetBufferPointer = reinterpret_cast<uint8_t *>(mappedResource.pData) + offset;
memcpy(offsetBufferPointer, data, size); memcpy(offsetBufferPointer, data, size);
context->Unmap(mNativeBuffer, 0); context->Unmap(mNativeStorage, 0);
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
void Buffer11::NativeBuffer11::unmap() void Buffer11::NativeStorage::unmap()
{ {
ASSERT(mUsage == BUFFER_USAGE_STAGING); ASSERT(mUsage == BUFFER_USAGE_STAGING);
ID3D11DeviceContext *context = mRenderer->getDeviceContext(); ID3D11DeviceContext *context = mRenderer->getDeviceContext();
context->Unmap(mNativeBuffer, 0); context->Unmap(mNativeStorage, 0);
} }
Buffer11::PackStorage11::PackStorage11(Renderer11 *renderer) Buffer11::PackStorage::PackStorage(Renderer11 *renderer)
: BufferStorage11(renderer, BUFFER_USAGE_PIXEL_PACK), : BufferStorage(renderer, BUFFER_USAGE_PIXEL_PACK),
mStagingTexture(NULL), mStagingTexture(NULL),
mTextureFormat(DXGI_FORMAT_UNKNOWN), mTextureFormat(DXGI_FORMAT_UNKNOWN),
mQueuedPackCommand(NULL), mQueuedPackCommand(NULL),
...@@ -841,13 +844,13 @@ Buffer11::PackStorage11::PackStorage11(Renderer11 *renderer) ...@@ -841,13 +844,13 @@ Buffer11::PackStorage11::PackStorage11(Renderer11 *renderer)
{ {
} }
Buffer11::PackStorage11::~PackStorage11() Buffer11::PackStorage::~PackStorage()
{ {
SafeRelease(mStagingTexture); SafeRelease(mStagingTexture);
SafeDelete(mQueuedPackCommand); SafeDelete(mQueuedPackCommand);
} }
bool Buffer11::PackStorage11::copyFromStorage(BufferStorage11 *source, size_t sourceOffset, bool Buffer11::PackStorage::copyFromStorage(BufferStorage *source, size_t sourceOffset,
size_t size, size_t destOffset) size_t size, size_t destOffset)
{ {
// We copy through a staging buffer when drawing with a pack buffer, // We copy through a staging buffer when drawing with a pack buffer,
...@@ -856,7 +859,7 @@ bool Buffer11::PackStorage11::copyFromStorage(BufferStorage11 *source, size_t so ...@@ -856,7 +859,7 @@ bool Buffer11::PackStorage11::copyFromStorage(BufferStorage11 *source, size_t so
return false; return false;
} }
gl::Error Buffer11::PackStorage11::resize(size_t size, bool preserveData) gl::Error Buffer11::PackStorage::resize(size_t size, bool preserveData)
{ {
if (size != mBufferSize) if (size != mBufferSize)
{ {
...@@ -870,7 +873,7 @@ gl::Error Buffer11::PackStorage11::resize(size_t size, bool preserveData) ...@@ -870,7 +873,7 @@ gl::Error Buffer11::PackStorage11::resize(size_t size, bool preserveData)
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
void *Buffer11::PackStorage11::map(size_t offset, size_t length, GLbitfield access) uint8_t *Buffer11::PackStorage::map(size_t offset, size_t length, GLbitfield access)
{ {
ASSERT(offset + length <= getSize()); ASSERT(offset + length <= getSize());
// TODO: fast path // TODO: fast path
...@@ -889,12 +892,12 @@ void *Buffer11::PackStorage11::map(size_t offset, size_t length, GLbitfield acce ...@@ -889,12 +892,12 @@ void *Buffer11::PackStorage11::map(size_t offset, size_t length, GLbitfield acce
return mMemoryBuffer.data() + offset; return mMemoryBuffer.data() + offset;
} }
void Buffer11::PackStorage11::unmap() void Buffer11::PackStorage::unmap()
{ {
// No-op // No-op
} }
gl::Error Buffer11::PackStorage11::packPixels(ID3D11Texture2D *srcTexure, UINT srcSubresource, const PackPixelsParams &params) gl::Error Buffer11::PackStorage::packPixels(ID3D11Texture2D *srcTexure, UINT srcSubresource, const PackPixelsParams &params)
{ {
gl::Error error = flushQueuedPackCommand(); gl::Error error = flushQueuedPackCommand();
if (error.isError()) if (error.isError())
...@@ -966,7 +969,7 @@ gl::Error Buffer11::PackStorage11::packPixels(ID3D11Texture2D *srcTexure, UINT s ...@@ -966,7 +969,7 @@ gl::Error Buffer11::PackStorage11::packPixels(ID3D11Texture2D *srcTexure, UINT s
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
gl::Error Buffer11::PackStorage11::flushQueuedPackCommand() gl::Error Buffer11::PackStorage::flushQueuedPackCommand()
{ {
ASSERT(mMemoryBuffer.size() > 0); ASSERT(mMemoryBuffer.size() > 0);
......
src/libANGLE/renderer/d3d/d3d11/Buffer11.h
...@@ -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