Commit b9c0d3b6 by Geoff Lang

Move buffer::markTransformFeedbackUsage to BufferD3D only.

BUG=angleproject:681 Change-Id: Ia9f4ac9cee2c3e4fa140eba12bdb9ab0cc423f6c Reviewed-on: https://chromium-review.googlesource.com/261709Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 1c0ad625
...@@ -118,11 +118,4 @@ Error Buffer::unmap() ...@@ -118,11 +118,4 @@ Error Buffer::unmap()
return error; return error;
} }
void Buffer::markTransformFeedbackUsage()
{
// TODO: Only used by the DX11 backend. Refactor to a more appropriate place.
mBuffer->markTransformFeedbackUsage();
mIndexRangeCache.clear();
}
} }
...@@ -48,8 +48,6 @@ class Buffer : public RefCountObject ...@@ -48,8 +48,6 @@ class Buffer : public RefCountObject
rx::BufferImpl *getImplementation() const { return mBuffer; } rx::BufferImpl *getImplementation() const { return mBuffer; }
void markTransformFeedbackUsage();
rx::IndexRangeCache *getIndexRangeCache() { return &mIndexRangeCache; } rx::IndexRangeCache *getIndexRangeCache() { return &mIndexRangeCache; }
const rx::IndexRangeCache *getIndexRangeCache() const { return &mIndexRangeCache; } const rx::IndexRangeCache *getIndexRangeCache() const { return &mIndexRangeCache; }
......
...@@ -27,7 +27,6 @@ class BufferImpl ...@@ -27,7 +27,6 @@ class BufferImpl
virtual gl::Error copySubData(BufferImpl* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size) = 0; virtual gl::Error copySubData(BufferImpl* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size) = 0;
virtual gl::Error map(size_t offset, size_t length, GLbitfield access, GLvoid **mapPtr) = 0; virtual gl::Error map(size_t offset, size_t length, GLbitfield access, GLvoid **mapPtr) = 0;
virtual gl::Error unmap() = 0; virtual gl::Error unmap() = 0;
virtual void markTransformFeedbackUsage() = 0;
// This method may not have a corresponding GL-backed function. It is necessary // This method may not have a corresponding GL-backed function. It is necessary
// for validation, for certain indexed draw calls. // for validation, for certain indexed draw calls.
......
...@@ -31,6 +31,7 @@ class BufferD3D : public BufferImpl ...@@ -31,6 +31,7 @@ class BufferD3D : public BufferImpl
virtual size_t getSize() const = 0; virtual size_t getSize() const = 0;
virtual bool supportsDirectBinding() const = 0; virtual bool supportsDirectBinding() const = 0;
virtual RendererD3D *getRenderer() = 0; virtual RendererD3D *getRenderer() = 0;
virtual void markTransformFeedbackUsage() = 0;
StaticVertexBufferInterface *getStaticVertexBuffer() { return mStaticVertexBuffer; } StaticVertexBufferInterface *getStaticVertexBuffer() { return mStaticVertexBuffer; }
StaticIndexBufferInterface *getStaticIndexBuffer() { return mStaticIndexBuffer; } StaticIndexBufferInterface *getStaticIndexBuffer() { return mStaticIndexBuffer; }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "libANGLE/State.h" #include "libANGLE/State.h"
#include "libANGLE/VertexArray.h" #include "libANGLE/VertexArray.h"
#include "libANGLE/formatutils.h" #include "libANGLE/formatutils.h"
#include "libANGLE/renderer/d3d/BufferD3D.h"
#include "libANGLE/renderer/d3d/DisplayD3D.h" #include "libANGLE/renderer/d3d/DisplayD3D.h"
#include "libANGLE/renderer/d3d/IndexDataManager.h" #include "libANGLE/renderer/d3d/IndexDataManager.h"
...@@ -533,7 +534,8 @@ void RendererD3D::markTransformFeedbackUsage(const gl::Data &data) ...@@ -533,7 +534,8 @@ void RendererD3D::markTransformFeedbackUsage(const gl::Data &data)
gl::Buffer *buffer = data.state->getIndexedTransformFeedbackBuffer(i); gl::Buffer *buffer = data.state->getIndexedTransformFeedbackBuffer(i);
if (buffer) if (buffer)
{ {
buffer->markTransformFeedbackUsage(); BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
bufferD3D->markTransformFeedbackUsage();
} }
} }
} }
......
...@@ -90,11 +90,6 @@ gl::Error BufferGL::unmap() ...@@ -90,11 +90,6 @@ gl::Error BufferGL::unmap()
return gl::Error(GL_NO_ERROR); return gl::Error(GL_NO_ERROR);
} }
void BufferGL::markTransformFeedbackUsage()
{
UNIMPLEMENTED();
}
gl::Error BufferGL::getData(const uint8_t **outData) gl::Error BufferGL::getData(const uint8_t **outData)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
......
...@@ -28,7 +28,6 @@ class BufferGL : public BufferImpl ...@@ -28,7 +28,6 @@ class BufferGL : public BufferImpl
gl::Error copySubData(BufferImpl* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size) override; gl::Error copySubData(BufferImpl* source, GLintptr sourceOffset, GLintptr destOffset, GLsizeiptr size) override;
gl::Error map(size_t offset, size_t length, GLbitfield access, GLvoid **mapPtr) override; gl::Error map(size_t offset, size_t length, GLbitfield access, GLvoid **mapPtr) override;
gl::Error unmap() override; gl::Error unmap() override;
void markTransformFeedbackUsage() override;
// This method may not have a corresponding GL-backed function. It is necessary // This method may not have a corresponding GL-backed function. It is necessary
// for validation, for certain indexed draw calls. // for validation, for certain indexed draw calls.
......
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