Remove DefaultAttachment.

src/libANGLE/Framebuffer.h

@@ -19,7 +19,6 @@
 
 namespace rx
 {
-class DefaultAttachmentImpl;
 class ImplFactory;
 class FramebufferImpl;
 class RenderbufferImpl;

src/libANGLE/FramebufferAttachment.cpp

@@ -15,7 +15,6 @@
 #include "libANGLE/Surface.h"
 #include "libANGLE/Texture.h"
 #include "libANGLE/formatutils.h"
-#include "libANGLE/renderer/DefaultAttachmentImpl.h"
 #include "libANGLE/renderer/FramebufferImpl.h"
 
 namespace gl

src/libANGLE/FramebufferAttachment.h

@@ -17,11 +17,6 @@
 
 #include "angle_gl.h"
 
-namespace rx
-{
-class DefaultAttachmentImpl;
-}
-
 namespace gl
 {
 class Renderbuffer;

src/libANGLE/renderer/DefaultAttachmentImpl.h

-//
-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-// DefaultAttachmentImpl.h: Defines the abstract rx::DefaultAttachmentImpl class.
-
-#ifndef LIBANGLE_RENDERER_DEFAULTATTACHMENTIMPL_H_
-#define LIBANGLE_RENDERER_DEFAULTATTACHMENTIMPL_H_
-
-#include "angle_gl.h"
-#include "common/angleutils.h"
-
-namespace rx
-{
-
-class DefaultAttachmentImpl : angle::NonCopyable
-{
-  public:
-    DefaultAttachmentImpl() {}
-    virtual ~DefaultAttachmentImpl() {}
-
-    virtual GLsizei getWidth() const = 0;
-    virtual GLsizei getHeight() const = 0;
-    virtual GLenum getInternalFormat() const = 0;
-    virtual GLsizei getSamples() const = 0;
-};
-
-}
-
-#endif // LIBANGLE_RENDERER_DEFAULTATTACHMENTIMPL_H_

src/libANGLE/renderer/ImplFactory.h

@@ -16,7 +16,6 @@ namespace rx
 {
 class BufferImpl;
 class CompilerImpl;
-class DefaultAttachmentImpl;
 class FenceNVImpl;
 class FenceSyncImpl;
 class FramebufferImpl;
@@ -40,7 +39,6 @@ class ImplFactory : angle::NonCopyable
     virtual ProgramImpl *createProgram() = 0;
 
     // Framebuffer creation
-    virtual DefaultAttachmentImpl *createDefaultAttachment(GLenum type, egl::Surface *surface) = 0;
     virtual FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) = 0;
     virtual FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) = 0;
 

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -84,48 +84,6 @@ ClearParameters GetClearParameters(const gl::State &state, GLbitfield mask)
 
 }
 
-DefaultAttachmentD3D::DefaultAttachmentD3D(RenderTargetD3D *renderTarget)
-    : mRenderTarget(renderTarget)
-{
-    ASSERT(mRenderTarget);
-}
-
-DefaultAttachmentD3D::~DefaultAttachmentD3D()
-{
-    SafeDelete(mRenderTarget);
-}
-
-DefaultAttachmentD3D *DefaultAttachmentD3D::makeDefaultAttachmentD3D(DefaultAttachmentImpl* impl)
-{
-    ASSERT(HAS_DYNAMIC_TYPE(DefaultAttachmentD3D*, impl));
-    return static_cast<DefaultAttachmentD3D*>(impl);
-}
-
-GLsizei DefaultAttachmentD3D::getWidth() const
-{
-    return mRenderTarget->getWidth();
-}
-
-GLsizei DefaultAttachmentD3D::getHeight() const
-{
-    return mRenderTarget->getHeight();
-}
-
-GLenum DefaultAttachmentD3D::getInternalFormat() const
-{
-    return mRenderTarget->getInternalFormat();
-}
-
-GLsizei DefaultAttachmentD3D::getSamples() const
-{
-    return mRenderTarget->getSamples();
-}
-
-RenderTargetD3D *DefaultAttachmentD3D::getRenderTarget() const
-{
-    return mRenderTarget;
-}
-
 FramebufferD3D::FramebufferD3D(const gl::Framebuffer::Data &data, RendererD3D *renderer)
     : FramebufferImpl(data),
       mRenderer(renderer),

src/libANGLE/renderer/d3d/FramebufferD3D.h

@@ -13,7 +13,6 @@
 #include <cstdint>
 
 #include "libANGLE/angletypes.h"
-#include "libANGLE/renderer/DefaultAttachmentImpl.h"
 #include "libANGLE/renderer/FramebufferImpl.h"
 
 namespace gl
@@ -50,25 +49,6 @@ struct ClearParameters
     gl::Rectangle scissor;
 };
 
-class DefaultAttachmentD3D : public DefaultAttachmentImpl
-{
-  public:
-    DefaultAttachmentD3D(RenderTargetD3D *renderTarget);
-    virtual ~DefaultAttachmentD3D();
-
-    static DefaultAttachmentD3D *makeDefaultAttachmentD3D(DefaultAttachmentImpl* impl);
-
-    virtual GLsizei getWidth() const override;
-    virtual GLsizei getHeight() const override;
-    virtual GLenum getInternalFormat() const override;
-    virtual GLsizei getSamples() const override;
-
-    RenderTargetD3D *getRenderTarget() const;
-
-  private:
-    RenderTargetD3D *mRenderTarget;
-};
-
 class FramebufferD3D : public FramebufferImpl
 {
   public:

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -2695,42 +2695,6 @@ gl::Error Renderer11::createRenderTarget(int width, int height, GLenum format, G
     return gl::Error(GL_NO_ERROR);
 }
 
-DefaultAttachmentImpl *Renderer11::createDefaultAttachment(GLenum type, egl::Surface *surface)
-{
-    SurfaceD3D *surfaceD3D = GetImplAs<SurfaceD3D>(surface);
-    SwapChain11 *swapChain = SwapChain11::makeSwapChain11(surfaceD3D->getSwapChain());
-
-    switch (type)
-    {
-      case GL_BACK:
-        return new DefaultAttachmentD3D(new SurfaceRenderTarget11(swapChain, this, false));
-
-      case GL_DEPTH:
-        if (gl::GetInternalFormatInfo(swapChain->GetDepthBufferInternalFormat()).depthBits > 0)
-        {
-            return new DefaultAttachmentD3D(new SurfaceRenderTarget11(swapChain, this, true));
-        }
-        else
-        {
-            return NULL;
-        }
-
-      case GL_STENCIL:
-        if (gl::GetInternalFormatInfo(swapChain->GetDepthBufferInternalFormat()).stencilBits > 0)
-        {
-            return new DefaultAttachmentD3D(new SurfaceRenderTarget11(swapChain, this, true));
-        }
-        else
-        {
-            return NULL;
-        }
-
-      default:
-        UNREACHABLE();
-        return NULL;
-    }
-}
-
 FramebufferImpl *Renderer11::createDefaultFramebuffer(const gl::Framebuffer::Data &data)
 {
     return createFramebuffer(data);

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -150,7 +150,6 @@ class Renderer11 : public RendererD3D
     virtual gl::Error createRenderTarget(int width, int height, GLenum format, GLsizei samples, RenderTargetD3D **outRT);
 
     // Framebuffer creation
-    DefaultAttachmentImpl *createDefaultAttachment(GLenum type, egl::Surface *surface) override;
     FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) override;
     FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) override;
 

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -2622,42 +2622,6 @@ gl::Error Renderer9::createRenderTarget(int width, int height, GLenum format, GL
     return gl::Error(GL_NO_ERROR);
 }
 
-DefaultAttachmentImpl *Renderer9::createDefaultAttachment(GLenum type, egl::Surface *surface)
-{
-    SurfaceD3D *surfaceD3D = GetImplAs<SurfaceD3D>(surface);
-    SwapChain9 *swapChain = SwapChain9::makeSwapChain9(surfaceD3D->getSwapChain());
-
-    switch (type)
-    {
-      case GL_BACK:
-        return new DefaultAttachmentD3D(new SurfaceRenderTarget9(swapChain, false));
-
-      case GL_DEPTH:
-        if (gl::GetInternalFormatInfo(swapChain->GetDepthBufferInternalFormat()).depthBits > 0)
-        {
-            return new DefaultAttachmentD3D(new SurfaceRenderTarget9(swapChain, true));
-        }
-        else
-        {
-            return NULL;
-        }
-
-      case GL_STENCIL:
-        if (gl::GetInternalFormatInfo(swapChain->GetDepthBufferInternalFormat()).stencilBits > 0)
-        {
-            return new DefaultAttachmentD3D(new SurfaceRenderTarget9(swapChain, true));
-        }
-        else
-        {
-            return NULL;
-        }
-
-      default:
-        UNREACHABLE();
-        return NULL;
-    }
-}
-
 FramebufferImpl *Renderer9::createDefaultFramebuffer(const gl::Framebuffer::Data &data)
 {
     return createFramebuffer(data);

src/libANGLE/renderer/d3d/d3d9/Renderer9.h

@@ -163,7 +163,6 @@ class Renderer9 : public RendererD3D
     virtual gl::Error createRenderTarget(int width, int height, GLenum format, GLsizei samples, RenderTargetD3D **outRT);
 
     // Framebuffer creation
-    DefaultAttachmentImpl *createDefaultAttachment(GLenum type, egl::Surface *surface) override;
     FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) override;
     FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) override;
 

src/libANGLE/renderer/generate_new_renderer.py

@@ -33,7 +33,6 @@ if not os.path.isdir(renderer_name):
 impl_classes = [
     'Buffer',
     'Compiler',
-    'DefaultAttachment',
     'Display',
     'FenceNV',
     'FenceSync',

src/libANGLE/renderer/gl/DefaultAttachmentGL.cpp

-//
-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-// DefaultAttachmentGL.cpp: Implements the class methods for DefaultAttachmentGL.
-
-#include "libANGLE/renderer/gl/DefaultAttachmentGL.h"
-
-#include "common/debug.h"
-#include "libANGLE/Config.h"
-#include "libANGLE/Surface.h"
-
-namespace rx
-{
-
-DefaultAttachmentGL::DefaultAttachmentGL(GLenum type, egl::Surface *surface)
-    : DefaultAttachmentImpl(),
-      mType(type),
-      mSurface(surface)
-{
-    ASSERT(mSurface != nullptr);
-}
-
-DefaultAttachmentGL::~DefaultAttachmentGL()
-{
-}
-
-GLsizei DefaultAttachmentGL::getWidth() const
-{
-    return mSurface->getWidth();
-}
-
-GLsizei DefaultAttachmentGL::getHeight() const
-{
-    return mSurface->getHeight();
-}
-
-GLenum DefaultAttachmentGL::getInternalFormat() const
-{
-    const egl::Config *config = mSurface->getConfig();
-    return (mType == GL_COLOR ? config->renderTargetFormat : config->depthStencilFormat);
-}
-
-GLsizei DefaultAttachmentGL::getSamples() const
-{
-    const egl::Config *config = mSurface->getConfig();
-    return config->samples;
-}
-
-}

src/libANGLE/renderer/gl/DefaultAttachmentGL.h

-//
-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-// DefaultAttachmentGL.h: Defines the class interface for DefaultAttachmentGL.
-
-#ifndef LIBANGLE_RENDERER_GL_DEFAULTATTACHMENTGL_H_
-#define LIBANGLE_RENDERER_GL_DEFAULTATTACHMENTGL_H_
-
-#include "libANGLE/renderer/DefaultAttachmentImpl.h"
-
-namespace egl
-{
-class Surface;
-}
-
-namespace rx
-{
-
-class DefaultAttachmentGL : public DefaultAttachmentImpl
-{
-  public:
-    DefaultAttachmentGL(GLenum type, egl::Surface *surface);
-    ~DefaultAttachmentGL() override;
-
-    GLsizei getWidth() const override;
-    GLsizei getHeight() const override;
-    GLenum getInternalFormat() const override;
-    GLsizei getSamples() const override;
-
-  private:
-    GLenum mType;
-    egl::Surface *mSurface;
-};
-
-}
-
-#endif // LIBANGLE_RENDERER_GL_DEFAULTATTACHMENTGL_H_

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -13,7 +13,6 @@
 #include "libANGLE/Surface.h"
 #include "libANGLE/renderer/gl/BufferGL.h"
 #include "libANGLE/renderer/gl/CompilerGL.h"
-#include "libANGLE/renderer/gl/DefaultAttachmentGL.h"
 #include "libANGLE/renderer/gl/FenceNVGL.h"
 #include "libANGLE/renderer/gl/FenceSyncGL.h"
 #include "libANGLE/renderer/gl/FramebufferGL.h"
@@ -108,11 +107,6 @@ ProgramImpl *RendererGL::createProgram()
     return new ProgramGL(mFunctions, mStateManager);
 }
 
-DefaultAttachmentImpl *RendererGL::createDefaultAttachment(GLenum type, egl::Surface *surface)
-{
-    return new DefaultAttachmentGL(type, surface);
-}
-
 FramebufferImpl *RendererGL::createDefaultFramebuffer(const gl::Framebuffer::Data &data)
 {
     return new FramebufferGL(data, mFunctions, mStateManager, true);

src/libANGLE/renderer/gl/RendererGL.h

@@ -37,7 +37,6 @@ class RendererGL : public Renderer
     ProgramImpl *createProgram() override;
 
     // Framebuffer creation
-    DefaultAttachmentImpl *createDefaultAttachment(GLenum type, egl::Surface *surface) override;
     FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) override;
     FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) override;
 

src/libGLESv2.gypi

@@ -116,7 +116,6 @@
             'libANGLE/queryconversions.h',
             'libANGLE/renderer/BufferImpl.h',
             'libANGLE/renderer/CompilerImpl.h',
-            'libANGLE/renderer/DefaultAttachmentImpl.h',
             'libANGLE/renderer/DisplayImpl.cpp',
             'libANGLE/renderer/DisplayImpl.h',
             'libANGLE/renderer/FenceNVImpl.h',
@@ -375,8 +374,6 @@
             'libANGLE/renderer/gl/BufferGL.h',
             'libANGLE/renderer/gl/CompilerGL.cpp',
             'libANGLE/renderer/gl/CompilerGL.h',
-            'libANGLE/renderer/gl/DefaultAttachmentGL.cpp',
-            'libANGLE/renderer/gl/DefaultAttachmentGL.h',
             'libANGLE/renderer/gl/DisplayGL.cpp',
             'libANGLE/renderer/gl/DisplayGL.h',
             'libANGLE/renderer/gl/FenceNVGL.cpp',

src/tests/angle_unittests_utils.h

@@ -26,7 +26,6 @@ class NullFactory : public ImplFactory
     ProgramImpl *createProgram() override { return nullptr; }
 
     // Framebuffer creation
-    DefaultAttachmentImpl *createDefaultAttachment(GLenum type, egl::Surface *surface) override { return nullptr; }
     FramebufferImpl *createDefaultFramebuffer(const gl::Framebuffer::Data &data) override { return nullptr; }
     FramebufferImpl *createFramebuffer(const gl::Framebuffer::Data &data) override { return nullptr; }