Move the Image::copy implementation to ImageD3D.

src/libANGLE/renderer/Image.cpp

@@ -9,9 +9,6 @@
 // surfaces or resources.
 
 #include "libANGLE/renderer/Image.h"
-#include "libANGLE/renderer/d3d/FramebufferD3D.h"
-#include "libANGLE/Framebuffer.h"
-#include "libANGLE/FramebufferAttachment.h"
 
 namespace rx
 {
@@ -28,20 +25,4 @@ Image::Image()
     mDirty = false;
 }
 
-gl::Error Image::copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &area, gl::Framebuffer *source)
-{
-    gl::FramebufferAttachment *colorbuffer = source->getReadColorbuffer();
-    ASSERT(colorbuffer);
-
-    RenderTarget *renderTarget = NULL;
-    gl::Error error = GetAttachmentRenderTarget(colorbuffer, &renderTarget);
-    if (error.isError())
-    {
-        return error;
-    }
-
-    ASSERT(renderTarget);
-    return copy(xoffset, yoffset, zoffset, area, renderTarget);
-}
-
 }

src/libANGLE/renderer/Image.h

@@ -54,8 +54,7 @@ class Image
     virtual gl::Error loadCompressedData(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
                                          const void *input) = 0;
 
-    gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, gl::Framebuffer *source);
-    virtual gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, RenderTarget *source) = 0;
+    virtual gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, gl::Framebuffer *source) = 0;
     virtual gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea,
                            const gl::ImageIndex &sourceIndex, TextureStorage *source) = 0;
 

src/libANGLE/renderer/d3d/ImageD3D.cpp

@@ -10,6 +10,10 @@
 
 #include "libANGLE/renderer/d3d/ImageD3D.h"
 
+#include "libANGLE/Framebuffer.h"
+#include "libANGLE/FramebufferAttachment.h"
+#include "libANGLE/renderer/d3d/FramebufferD3D.h"
+
 namespace rx
 {
 
@@ -23,4 +27,20 @@ ImageD3D *ImageD3D::makeImageD3D(Image *img)
     return static_cast<ImageD3D*>(img);
 }
 
+gl::Error ImageD3D::copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &area, gl::Framebuffer *source)
+{
+    gl::FramebufferAttachment *colorbuffer = source->getReadColorbuffer();
+    ASSERT(colorbuffer);
+
+    RenderTarget *renderTarget = NULL;
+    gl::Error error = GetAttachmentRenderTarget(colorbuffer, &renderTarget);
+    if (error.isError())
+    {
+        return error;
+    }
+
+    ASSERT(renderTarget);
+    return copy(xoffset, yoffset, zoffset, area, renderTarget);
+}
+
 }

src/libANGLE/renderer/d3d/ImageD3D.h

@@ -41,8 +41,12 @@ class ImageD3D : public Image
     virtual gl::Error setManagedSurface2DArray(TextureStorage *storage, int layer, int level) { return gl::Error(GL_NO_ERROR); };
     virtual gl::Error copyToStorage(TextureStorage *storage, const gl::ImageIndex &index, const gl::Box &region) = 0;
 
+    gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, gl::Framebuffer *source) override;
+
   private:
     DISALLOW_COPY_AND_ASSIGN(ImageD3D);
+
+    virtual gl::Error copy(GLint xoffset, GLint yoffset, GLint zoffset, const gl::Rectangle &sourceArea, RenderTarget *source) = 0;
 };
 
 }