Move getData from the D3D to the Impl.

src/libANGLE/renderer/BufferImpl.h

@@ -28,6 +28,10 @@ class BufferImpl
     virtual gl::Error map(size_t offset, size_t length, GLbitfield access, GLvoid **mapPtr) = 0;
     virtual gl::Error unmap() = 0;
     virtual void markTransformFeedbackUsage() = 0;
+
+    // This method may not have a corresponding GL-backed function. It is necessary
+    // for validation, for certain indexed draw calls.
+    virtual gl::Error getData(const uint8_t **outData) = 0;
 };
 
 }

src/libANGLE/renderer/d3d/BufferD3D.h

@@ -31,7 +31,6 @@ class BufferD3D : public BufferImpl
 
     unsigned int getSerial() const { return mSerial; }
 
-    virtual gl::Error getData(const uint8_t **outData) = 0;
     virtual size_t getSize() const = 0;
     virtual bool supportsDirectBinding() const = 0;
     virtual RendererD3D *getRenderer() = 0;

src/libANGLE/validationES.cpp

@@ -24,9 +24,6 @@
 #include "common/mathutil.h"
 #include "common/utilities.h"
 
-// FIXME(jmadill): remove this when we support buffer data caching
-#include "libANGLE/renderer/d3d/BufferD3D.h"
-
 namespace gl
 {
 
@@ -1653,10 +1650,9 @@ bool ValidateDrawElements(Context *context, GLenum mode, GLsizei count, GLenum t
         uintptr_t offset = reinterpret_cast<uintptr_t>(indices);
         if (!elementArrayBuffer->getIndexRangeCache()->findRange(type, offset, count, indexRangeOut, NULL))
         {
-            // FIXME(jmadill): Use buffer data caching instead of the D3D back-end
-            rx::BufferD3D *bufferD3D = rx::BufferD3D::makeBufferD3D(elementArrayBuffer->getImplementation());
+            rx::BufferImpl *bufferImpl = elementArrayBuffer->getImplementation();
             const uint8_t *dataPointer = NULL;
-            Error error = bufferD3D->getData(&dataPointer);
+            Error error = bufferImpl->getData(&dataPointer);
             if (error.isError())
             {
                 context->recordError(error);