Commit 1d57ad40 by Jamie Madill

Add some missing disallow macros.

DISALLOW_COPY_AND_ASSIGN was missing from CompilerImpl, FramebufferImpl and DefaultAttachmentImpl. BUG=angle:904 Change-Id: I2e57078cd5b40baf6962f19869c2f3b67ad6dc6e Reviewed-on: https://chromium-review.googlesource.com/245514Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 9236b418
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// CompilerImpl.h: Defines the rx::CompilerImpl class, an implementation interface // CompilerImpl.h: Defines the rx::CompilerImpl class, an implementation interface
// for the gl::Compiler object. // for the gl::Compiler object.
#include "common/angleutils.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#ifndef LIBANGLE_RENDERER_COMPILERIMPL_H_ #ifndef LIBANGLE_RENDERER_COMPILERIMPL_H_
...@@ -22,6 +23,9 @@ class CompilerImpl ...@@ -22,6 +23,9 @@ class CompilerImpl
virtual ~CompilerImpl() {} virtual ~CompilerImpl() {}
virtual gl::Error release() = 0; virtual gl::Error release() = 0;
private:
DISALLOW_COPY_AND_ASSIGN(CompilerImpl);
}; };
} }
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#ifndef LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_ #ifndef LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_
#define LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_ #define LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_
#include "libANGLE/Error.h"
#include "angle_gl.h" #include "angle_gl.h"
#include "common/angleutils.h"
#include "libANGLE/Error.h"
namespace gl namespace gl
{ {
...@@ -27,17 +27,22 @@ namespace rx ...@@ -27,17 +27,22 @@ namespace rx
class DefaultAttachmentImpl class DefaultAttachmentImpl
{ {
public: public:
DefaultAttachmentImpl() {}
virtual ~DefaultAttachmentImpl() {}; virtual ~DefaultAttachmentImpl() {};
virtual GLsizei getWidth() const = 0; virtual GLsizei getWidth() const = 0;
virtual GLsizei getHeight() const = 0; virtual GLsizei getHeight() const = 0;
virtual GLenum getInternalFormat() const = 0; virtual GLenum getInternalFormat() const = 0;
virtual GLsizei getSamples() const = 0; virtual GLsizei getSamples() const = 0;
private:
DISALLOW_COPY_AND_ASSIGN(DefaultAttachmentImpl);
}; };
class FramebufferImpl class FramebufferImpl
{ {
public: public:
FramebufferImpl() {}
virtual ~FramebufferImpl() {}; virtual ~FramebufferImpl() {};
virtual void setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment) = 0; virtual void setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment) = 0;
...@@ -65,6 +70,9 @@ class FramebufferImpl ...@@ -65,6 +70,9 @@ class FramebufferImpl
GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer) = 0; GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer) = 0;
virtual GLenum checkStatus() const = 0; virtual GLenum checkStatus() const = 0;
private:
DISALLOW_COPY_AND_ASSIGN(FramebufferImpl);
}; };
} }
......
...@@ -35,6 +35,8 @@ class CompilerD3D : public CompilerImpl ...@@ -35,6 +35,8 @@ class CompilerD3D : public CompilerImpl
ShHandle getCompilerHandle(GLenum type); ShHandle getCompilerHandle(GLenum type);
private: private:
DISALLOW_COPY_AND_ASSIGN(CompilerD3D);
ShShaderSpec mSpec; ShShaderSpec mSpec;
ShShaderOutput mOutputType; ShShaderOutput mOutputType;
ShBuiltInResources mResources; ShBuiltInResources mResources;
......
...@@ -42,6 +42,8 @@ class DefaultAttachmentD3D : public DefaultAttachmentImpl ...@@ -42,6 +42,8 @@ class DefaultAttachmentD3D : public DefaultAttachmentImpl
RenderTargetD3D *getRenderTarget() const; RenderTargetD3D *getRenderTarget() const;
private: private:
DISALLOW_COPY_AND_ASSIGN(DefaultAttachmentD3D);
RenderTargetD3D *mRenderTarget; RenderTargetD3D *mRenderTarget;
}; };
...@@ -86,6 +88,8 @@ class FramebufferD3D : public FramebufferImpl ...@@ -86,6 +88,8 @@ class FramebufferD3D : public FramebufferImpl
GLenum mReadBuffer; GLenum mReadBuffer;
private: private:
DISALLOW_COPY_AND_ASSIGN(FramebufferD3D);
RendererD3D *const mRenderer; RendererD3D *const mRenderer;
virtual gl::Error clear(const gl::State &state, const gl::ClearParameters &clearParams) = 0; virtual gl::Error clear(const gl::State &state, const gl::ClearParameters &clearParams) = 0;
......
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