Skip to content

A
angle
Commit 2dc4639f by Geoff Lang
Options

Rename SwapChain to SwapChainD3D and move it to the D3D folder.

BUG=angle:681 Change-Id: Idcf24556e590e07cc0b6cf640d4701353a0cda5e Reviewed-on: https://chromium-review.googlesource.com/238472Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent c2e75afa
Showing with 39 additions and 38 deletions
src/libANGLE/renderer/Renderer.h
......@@ -52,7 +52,6 @@ class FramebufferImpl;
class CompilerImpl;
struct TranslatedIndexData;
struct Workarounds;
class SwapChain;
class DisplayImpl;
struct ConfigDesc
......
src/libANGLE/renderer/d3d/DisplayD3D.cpp
......@@ -9,9 +9,9 @@
#include "libANGLE/renderer/d3d/DisplayD3D.h"
#include "libANGLE/Surface.h"
#include "libANGLE/renderer/SwapChain.h"
#include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/SurfaceD3D.h"
#include "libANGLE/renderer/d3d/SwapChainD3D.h"
namespace rx
{
......
src/libANGLE/renderer/d3d/RenderbufferD3D.h
......@@ -18,7 +18,7 @@ namespace rx
{
class RendererD3D;
class RenderTargetD3D;
class SwapChain;
class SwapChainD3D;
class RenderbufferD3D : public RenderbufferImpl
{
......
src/libANGLE/renderer/d3d/RendererD3D.h
......@@ -30,7 +30,7 @@ class ImageD3D;
class IndexBuffer;
class RenderTargetD3D;
class ShaderExecutable;
class SwapChain;
class SwapChainD3D;
class TextureStorage;
class UniformStorage;
class VertexBuffer;
......@@ -70,7 +70,7 @@ class RendererD3D : public Renderer
// Direct3D Specific methods
virtual GUID getAdapterIdentifier() const = 0;
virtual SwapChain *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat) = 0;
virtual SwapChainD3D *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat) = 0;
virtual gl::Error generateSwizzle(gl::Texture *texture) = 0;
virtual gl::Error setSamplerState(gl::SamplerType type, int index, gl::Texture *texture, const gl::SamplerState &sampler) = 0;
......@@ -132,7 +132,7 @@ class RendererD3D : public Renderer
// Image operations
virtual ImageD3D *createImage() = 0;
virtual gl::Error generateMipmap(ImageD3D *dest, ImageD3D *source) = 0;
virtual TextureStorage *createTextureStorage2D(SwapChain *swapChain) = 0;
virtual TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain) = 0;
virtual TextureStorage *createTextureStorage2D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels, bool hintLevelZeroOnly) = 0;
virtual TextureStorage *createTextureStorageCube(GLenum internalformat, bool renderTarget, int size, int levels) = 0;
virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0;
......
src/libANGLE/renderer/d3d/SurfaceD3D.cpp
......@@ -10,8 +10,8 @@
#include "libANGLE/Display.h"
#include "libANGLE/Surface.h"
#include "libANGLE/renderer/SwapChain.h"
#include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/SwapChainD3D.h"
#include <tchar.h>
#include <EGL/eglext.h>
......@@ -365,7 +365,7 @@ egl::Error SurfaceD3D::postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint he
return swapRect(x, y, width, height);
}
rx::SwapChain *SurfaceD3D::getSwapChain() const
rx::SwapChainD3D *SurfaceD3D::getSwapChain() const
{
return mSwapChain;
}
......
src/libANGLE/renderer/d3d/SurfaceD3D.h
......@@ -19,7 +19,7 @@ class Surface;
namespace rx
{
class SwapChain;
class SwapChainD3D;
class RendererD3D;
class SurfaceD3D : public SurfaceImpl
......@@ -46,7 +46,7 @@ class SurfaceD3D : public SurfaceImpl
void setSwapInterval(EGLint interval) override;
// D3D implementations (some virtual to hack across DLL boundaries)
virtual SwapChain *getSwapChain() const;
virtual SwapChainD3D *getSwapChain() const;
egl::Error resetSwapChain();
......@@ -70,7 +70,7 @@ class SurfaceD3D : public SurfaceImpl
RendererD3D *mRenderer;
SwapChain *mSwapChain;
SwapChainD3D *mSwapChain;
bool mSwapIntervalDirty;
bool mWindowSubclassed; // Indicates whether we successfully subclassed mWindow for WM_RESIZE hooking
......
src/libANGLE/renderer/SwapChain.h → src/libANGLE/renderer/d3d/SwapChainD3D.h
......@@ -4,11 +4,11 @@
// found in the LICENSE file.
//
// SwapChain.h: Defines a back-end specific class that hides the details of the
// SwapChainD3D.h: Defines a back-end specific class that hides the details of the
// implementation-specific swapchain.
#ifndef LIBANGLE_RENDERER_SWAPCHAIN_H_
#define LIBANGLE_RENDERER_SWAPCHAIN_H_
#ifndef LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
#define LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
// TODO: move SwapChain to be d3d only
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
......@@ -26,15 +26,15 @@
namespace rx
{
class SwapChain
class SwapChainD3D
{
public:
SwapChain(rx::NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
SwapChainD3D(rx::NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
: mNativeWindow(nativeWindow), mShareHandle(shareHandle), mBackBufferFormat(backBufferFormat), mDepthBufferFormat(depthBufferFormat)
{
}
virtual ~SwapChain() {};
virtual ~SwapChainD3D() {};
virtual EGLint resize(EGLint backbufferWidth, EGLint backbufferSize) = 0;
virtual EGLint reset(EGLint backbufferWidth, EGLint backbufferHeight, EGLint swapInterval) = 0;
......@@ -55,4 +55,4 @@ class SwapChain
};
}
#endif // LIBANGLE_RENDERER_SWAPCHAIN_H_
#endif // LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
src/libANGLE/renderer/d3d/TextureStorage.h
......@@ -26,7 +26,7 @@ struct PixelUnpackState;
namespace rx
{
class SwapChain;
class SwapChainD3D;
class RenderTargetD3D;
class ImageD3D;
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
......@@ -555,7 +555,7 @@ gl::Error Renderer11::finish()
return gl::Error(GL_NO_ERROR);
}
SwapChain *Renderer11::createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
SwapChainD3D *Renderer11::createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
{
return new SwapChain11(this, nativeWindow, shareHandle, backBufferFormat, depthBufferFormat);
}
......@@ -2779,7 +2779,7 @@ gl::Error Renderer11::generateMipmap(ImageD3D *dest, ImageD3D *src)
return Image11::generateMipmap(dest11, src11);
}
TextureStorage *Renderer11::createTextureStorage2D(SwapChain *swapChain)
TextureStorage *Renderer11::createTextureStorage2D(SwapChainD3D *swapChain)
{
SwapChain11 *swapChain11 = SwapChain11::makeSwapChain11(swapChain);
return new TextureStorage11_2D(this, swapChain11);
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.h
......@@ -63,7 +63,7 @@ class Renderer11 : public RendererD3D
gl::Error flush() override;
gl::Error finish() override;
virtual SwapChain *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
virtual SwapChainD3D *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
virtual gl::Error generateSwizzle(gl::Texture *texture);
virtual gl::Error setSamplerState(gl::SamplerType type, int index, gl::Texture *texture, const gl::SamplerState &sampler);
......@@ -153,7 +153,7 @@ class Renderer11 : public RendererD3D
// Image operations
virtual ImageD3D *createImage();
gl::Error generateMipmap(ImageD3D *dest, ImageD3D *source) override;
virtual TextureStorage *createTextureStorage2D(SwapChain *swapChain);
virtual TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain);
virtual TextureStorage *createTextureStorage2D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels, bool hintLevelZeroOnly);
virtual TextureStorage *createTextureStorageCube(GLenum internalformat, bool renderTarget, int size, int levels);
virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels);
......
src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
......@@ -24,7 +24,7 @@ namespace rx
SwapChain11::SwapChain11(Renderer11 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
GLenum backBufferFormat, GLenum depthBufferFormat)
: mRenderer(renderer),
SwapChain(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat)
SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat)
{
mSwapChain = NULL;
mBackBufferTexture = NULL;
......@@ -650,7 +650,7 @@ ID3D11Texture2D *SwapChain11::getDepthStencilTexture()
return mDepthStencilTexture;
}
SwapChain11 *SwapChain11::makeSwapChain11(SwapChain *swapChain)
SwapChain11 *SwapChain11::makeSwapChain11(SwapChainD3D *swapChain)
{
ASSERT(HAS_DYNAMIC_TYPE(SwapChain11*, swapChain));
return static_cast<SwapChain11*>(swapChain);
......
src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
......@@ -9,14 +9,15 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D11_SWAPCHAIN11_H_
#define LIBANGLE_RENDERER_D3D_D3D11_SWAPCHAIN11_H_
#include "libANGLE/renderer/d3d/SwapChainD3D.h"
#include "common/angleutils.h"
#include "libANGLE/renderer/SwapChain.h"
namespace rx
{
class Renderer11;
class SwapChain11 : public SwapChain
class SwapChain11 : public SwapChainD3D
{
public:
SwapChain11(Renderer11 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
......@@ -39,7 +40,7 @@ class SwapChain11 : public SwapChain
EGLint getWidth() const { return mWidth; }
EGLint getHeight() const { return mHeight; }
static SwapChain11 *makeSwapChain11(SwapChain *swapChain);
static SwapChain11 *makeSwapChain11(SwapChainD3D *swapChain);
private:
DISALLOW_COPY_AND_ASSIGN(SwapChain11);
......
src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
......@@ -594,7 +594,7 @@ gl::Error Renderer9::finish()
return gl::Error(GL_NO_ERROR);
}
SwapChain *Renderer9::createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
SwapChainD3D *Renderer9::createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat)
{
return new SwapChain9(this, nativeWindow, shareHandle, backBufferFormat, depthBufferFormat);
}
......@@ -2820,7 +2820,7 @@ gl::Error Renderer9::generateMipmap(ImageD3D *dest, ImageD3D *src)
return Image9::generateMipmap(dst9, src9);
}
TextureStorage *Renderer9::createTextureStorage2D(SwapChain *swapChain)
TextureStorage *Renderer9::createTextureStorage2D(SwapChainD3D *swapChain)
{
SwapChain9 *swapChain9 = SwapChain9::makeSwapChain9(swapChain);
return new TextureStorage9_2D(this, swapChain9);
......
src/libANGLE/renderer/d3d/d3d9/Renderer9.h
......@@ -56,7 +56,7 @@ class Renderer9 : public RendererD3D
gl::Error flush() override;
gl::Error finish() override;
virtual SwapChain *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
virtual SwapChainD3D *createSwapChain(NativeWindow nativeWindow, HANDLE shareHandle, GLenum backBufferFormat, GLenum depthBufferFormat);
gl::Error allocateEventQuery(IDirect3DQuery9 **outQuery);
void freeEventQuery(IDirect3DQuery9* query);
......@@ -162,7 +162,7 @@ class Renderer9 : public RendererD3D
// Image operations
virtual ImageD3D *createImage();
gl::Error generateMipmap(ImageD3D *dest, ImageD3D *source) override;
virtual TextureStorage *createTextureStorage2D(SwapChain *swapChain);
virtual TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain);
virtual TextureStorage *createTextureStorage2D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels, bool hintLevelZeroOnly);
virtual TextureStorage *createTextureStorageCube(GLenum internalformat, bool renderTarget, int size, int levels);
virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels);
......
src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
......@@ -18,7 +18,7 @@ namespace rx
SwapChain9::SwapChain9(Renderer9 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
GLenum backBufferFormat, GLenum depthBufferFormat)
: mRenderer(renderer),
SwapChain(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat)
SwapChainD3D(nativeWindow, shareHandle, backBufferFormat, depthBufferFormat)
{
mSwapChain = NULL;
mBackBuffer = NULL;
......@@ -380,7 +380,7 @@ IDirect3DTexture9 *SwapChain9::getOffscreenTexture()
return mOffscreenTexture;
}
SwapChain9 *SwapChain9::makeSwapChain9(SwapChain *swapChain)
SwapChain9 *SwapChain9::makeSwapChain9(SwapChainD3D *swapChain)
{
ASSERT(HAS_DYNAMIC_TYPE(SwapChain9*, swapChain));
return static_cast<SwapChain9*>(swapChain);
......
src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
......@@ -9,14 +9,15 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D9_SWAPCHAIN9_H_
#define LIBANGLE_RENDERER_D3D_D3D9_SWAPCHAIN9_H_
#include "libANGLE/renderer/d3d/SwapChainD3D.h"
#include "common/angleutils.h"
#include "libANGLE/renderer/SwapChain.h"
namespace rx
{
class Renderer9;
class SwapChain9 : public SwapChain
class SwapChain9 : public SwapChainD3D
{
public:
SwapChain9(Renderer9 *renderer, NativeWindow nativeWindow, HANDLE shareHandle,
......@@ -35,7 +36,7 @@ class SwapChain9 : public SwapChain
EGLint getWidth() const { return mWidth; }
EGLint getHeight() const { return mHeight; }
static SwapChain9 *makeSwapChain9(SwapChain *swapChain);
static SwapChain9 *makeSwapChain9(SwapChainD3D *swapChain);
private:
DISALLOW_COPY_AND_ASSIGN(SwapChain9);
......
src/libGLESv2.gypi
......@@ -126,7 +126,6 @@
'libANGLE/renderer/ShaderImpl.h',
'libANGLE/renderer/SurfaceImpl.cpp',
'libANGLE/renderer/SurfaceImpl.h',
'libANGLE/renderer/SwapChain.h',
'libANGLE/renderer/TextureImpl.h',
'libANGLE/renderer/TransformFeedbackImpl.h',
'libANGLE/renderer/VertexArrayImpl.h',
......@@ -187,6 +186,7 @@
'libANGLE/renderer/d3d/ShaderD3D.h',
'libANGLE/renderer/d3d/SurfaceD3D.cpp',
'libANGLE/renderer/d3d/SurfaceD3D.h',
'libANGLE/renderer/d3d/SwapChainD3D.h',
'libANGLE/renderer/d3d/TextureD3D.cpp',
'libANGLE/renderer/d3d/TextureD3D.h',
'libANGLE/renderer/d3d/TextureStorage.cpp',
......
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