Skip to content

A
angle
Commit 4f4207f7 by Geoff Lang
Options

Make some FramebufferAttachment methods const.

BUG=angle:841 Change-Id: I4670e417c1976ebd2198ea4c8927a00fff7bb15c Reviewed-on: https://chromium-review.googlesource.com/232380Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 43b65311
Showing with 24 additions and 24 deletions
src/libANGLE/Framebuffer.cpp
...@@ -27,7 +27,7 @@ namespace rx ...@@ -27,7 +27,7 @@ namespace rx
{ {
// TODO: Move these functions, and the D3D-specific header inclusions above, // TODO: Move these functions, and the D3D-specific header inclusions above,
// to FramebufferD3D. // to FramebufferD3D.
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget **outRT) gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget **outRT)
{ {
if (attachment->type() == GL_TEXTURE) if (attachment->type() == GL_TEXTURE)
{ {
...@@ -48,7 +48,7 @@ gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, Rende ...@@ -48,7 +48,7 @@ gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, Rende
} }
else if (attachment->type() == GL_FRAMEBUFFER_DEFAULT) else if (attachment->type() == GL_FRAMEBUFFER_DEFAULT)
{ {
gl::DefaultAttachment *defaultAttachment = static_cast<gl::DefaultAttachment *>(attachment); const gl::DefaultAttachment *defaultAttachment = static_cast<const gl::DefaultAttachment *>(attachment);
DefaultAttachmentD3D *defaultAttachmentD3D = DefaultAttachmentD3D::makeDefaultAttachmentD3D(defaultAttachment->getImplementation()); DefaultAttachmentD3D *defaultAttachmentD3D = DefaultAttachmentD3D::makeDefaultAttachmentD3D(defaultAttachment->getImplementation());
ASSERT(defaultAttachmentD3D); ASSERT(defaultAttachmentD3D);
...@@ -63,7 +63,7 @@ gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, Rende ...@@ -63,7 +63,7 @@ gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, Rende
} }
// Note: RenderTarget serials should ideally be in the RenderTargets themselves. // Note: RenderTarget serials should ideally be in the RenderTargets themselves.
unsigned int GetAttachmentSerial(gl::FramebufferAttachment *attachment) unsigned int GetAttachmentSerial(const gl::FramebufferAttachment *attachment)
{ {
if (attachment->type() == GL_TEXTURE) if (attachment->type() == GL_TEXTURE)
{ {
...@@ -83,7 +83,7 @@ unsigned int GetAttachmentSerial(gl::FramebufferAttachment *attachment) ...@@ -83,7 +83,7 @@ unsigned int GetAttachmentSerial(gl::FramebufferAttachment *attachment)
} }
else if (attachment->type() == GL_FRAMEBUFFER_DEFAULT) else if (attachment->type() == GL_FRAMEBUFFER_DEFAULT)
{ {
gl::DefaultAttachment *defaultAttachment = static_cast<gl::DefaultAttachment *>(attachment); const gl::DefaultAttachment *defaultAttachment = static_cast<const gl::DefaultAttachment *>(attachment);
DefaultAttachmentD3D *defaultAttachmentD3D = DefaultAttachmentD3D::makeDefaultAttachmentD3D(defaultAttachment->getImplementation()); DefaultAttachmentD3D *defaultAttachmentD3D = DefaultAttachmentD3D::makeDefaultAttachmentD3D(defaultAttachment->getImplementation());
ASSERT(defaultAttachmentD3D); ASSERT(defaultAttachmentD3D);
return defaultAttachmentD3D->getRenderTarget()->getSerial(); return defaultAttachmentD3D->getRenderTarget()->getSerial();
......
src/libANGLE/Framebuffer.h
...@@ -120,8 +120,8 @@ namespace rx ...@@ -120,8 +120,8 @@ namespace rx
class RenderTarget; class RenderTarget;
// TODO: place this in FramebufferD3D.h // TODO: place this in FramebufferD3D.h
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget **outRT); gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget **outRT);
unsigned int GetAttachmentSerial(gl::FramebufferAttachment *attachment); unsigned int GetAttachmentSerial(const gl::FramebufferAttachment *attachment);
} }
......
src/libANGLE/FramebufferAttachment.cpp
...@@ -136,7 +136,7 @@ GLint TextureAttachment::layer() const ...@@ -136,7 +136,7 @@ GLint TextureAttachment::layer() const
return mIndex.layerIndex; return mIndex.layerIndex;
} }
Texture *TextureAttachment::getTexture() Texture *TextureAttachment::getTexture() const
{ {
return mTexture.get(); return mTexture.get();
} }
...@@ -146,7 +146,7 @@ const ImageIndex *TextureAttachment::getTextureImageIndex() const ...@@ -146,7 +146,7 @@ const ImageIndex *TextureAttachment::getTextureImageIndex() const
return &mIndex; return &mIndex;
} }
Renderbuffer *TextureAttachment::getRenderbuffer() Renderbuffer *TextureAttachment::getRenderbuffer() const
{ {
UNREACHABLE(); UNREACHABLE();
return NULL; return NULL;
...@@ -216,7 +216,7 @@ GLint RenderbufferAttachment::layer() const ...@@ -216,7 +216,7 @@ GLint RenderbufferAttachment::layer() const
return 0; return 0;
} }
Texture *RenderbufferAttachment::getTexture() Texture *RenderbufferAttachment::getTexture() const
{ {
UNREACHABLE(); UNREACHABLE();
return NULL; return NULL;
...@@ -228,7 +228,7 @@ const ImageIndex *RenderbufferAttachment::getTextureImageIndex() const ...@@ -228,7 +228,7 @@ const ImageIndex *RenderbufferAttachment::getTextureImageIndex() const
return NULL; return NULL;
} }
Renderbuffer *RenderbufferAttachment::getRenderbuffer() Renderbuffer *RenderbufferAttachment::getRenderbuffer() const
{ {
return mRenderbuffer.get(); return mRenderbuffer.get();
} }
...@@ -296,7 +296,7 @@ GLint DefaultAttachment::layer() const ...@@ -296,7 +296,7 @@ GLint DefaultAttachment::layer() const
return 0; return 0;
} }
Texture *DefaultAttachment::getTexture() Texture *DefaultAttachment::getTexture() const
{ {
UNREACHABLE(); UNREACHABLE();
return NULL; return NULL;
...@@ -308,7 +308,7 @@ const ImageIndex *DefaultAttachment::getTextureImageIndex() const ...@@ -308,7 +308,7 @@ const ImageIndex *DefaultAttachment::getTextureImageIndex() const
return NULL; return NULL;
} }
Renderbuffer *DefaultAttachment::getRenderbuffer() Renderbuffer *DefaultAttachment::getRenderbuffer() const
{ {
UNREACHABLE(); UNREACHABLE();
return NULL; return NULL;
......
src/libANGLE/FramebufferAttachment.h
...@@ -66,9 +66,9 @@ class FramebufferAttachment ...@@ -66,9 +66,9 @@ class FramebufferAttachment
virtual GLenum cubeMapFace() const = 0; virtual GLenum cubeMapFace() const = 0;
virtual GLint layer() const = 0; virtual GLint layer() const = 0;
virtual Texture *getTexture() = 0; virtual Texture *getTexture() const = 0;
virtual const ImageIndex *getTextureImageIndex() const = 0; virtual const ImageIndex *getTextureImageIndex() const = 0;
virtual Renderbuffer *getRenderbuffer() = 0; virtual Renderbuffer *getRenderbuffer() const = 0;
private: private:
DISALLOW_COPY_AND_ASSIGN(FramebufferAttachment); DISALLOW_COPY_AND_ASSIGN(FramebufferAttachment);
...@@ -95,9 +95,9 @@ class TextureAttachment : public FramebufferAttachment ...@@ -95,9 +95,9 @@ class TextureAttachment : public FramebufferAttachment
virtual GLenum cubeMapFace() const; virtual GLenum cubeMapFace() const;
virtual GLint layer() const; virtual GLint layer() const;
virtual Texture *getTexture(); virtual Texture *getTexture() const;
virtual const ImageIndex *getTextureImageIndex() const; virtual const ImageIndex *getTextureImageIndex() const;
virtual Renderbuffer *getRenderbuffer(); virtual Renderbuffer *getRenderbuffer() const;
private: private:
DISALLOW_COPY_AND_ASSIGN(TextureAttachment); DISALLOW_COPY_AND_ASSIGN(TextureAttachment);
...@@ -125,9 +125,9 @@ class RenderbufferAttachment : public FramebufferAttachment ...@@ -125,9 +125,9 @@ class RenderbufferAttachment : public FramebufferAttachment
virtual GLenum cubeMapFace() const; virtual GLenum cubeMapFace() const;
virtual GLint layer() const; virtual GLint layer() const;
virtual Texture *getTexture(); virtual Texture *getTexture() const;
virtual const ImageIndex *getTextureImageIndex() const; virtual const ImageIndex *getTextureImageIndex() const;
virtual Renderbuffer *getRenderbuffer(); virtual Renderbuffer *getRenderbuffer() const;
private: private:
DISALLOW_COPY_AND_ASSIGN(RenderbufferAttachment); DISALLOW_COPY_AND_ASSIGN(RenderbufferAttachment);
...@@ -154,9 +154,9 @@ class DefaultAttachment : public FramebufferAttachment ...@@ -154,9 +154,9 @@ class DefaultAttachment : public FramebufferAttachment
virtual GLenum cubeMapFace() const; virtual GLenum cubeMapFace() const;
virtual GLint layer() const; virtual GLint layer() const;
virtual Texture *getTexture(); virtual Texture *getTexture() const;
virtual const ImageIndex *getTextureImageIndex() const; virtual const ImageIndex *getTextureImageIndex() const;
virtual Renderbuffer *getRenderbuffer(); virtual Renderbuffer *getRenderbuffer() const;
rx::DefaultAttachmentImpl *getImplementation() const; rx::DefaultAttachmentImpl *getImplementation() const;
......
src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
...@@ -1066,7 +1066,7 @@ HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name) ...@@ -1066,7 +1066,7 @@ HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name)
#endif #endif
} }
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget11 **outRT) gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget11 **outRT)
{ {
RenderTarget *renderTarget = NULL; RenderTarget *renderTarget = NULL;
gl::Error error = rx::GetAttachmentRenderTarget(attachment, &renderTarget); gl::Error error = rx::GetAttachmentRenderTarget(attachment, &renderTarget);
......
src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
...@@ -178,7 +178,7 @@ inline void SetBufferData(ID3D11DeviceContext *context, ID3D11Buffer *constantBu ...@@ -178,7 +178,7 @@ inline void SetBufferData(ID3D11DeviceContext *context, ID3D11Buffer *constantBu
context->Unmap(constantBuffer, 0); context->Unmap(constantBuffer, 0);
} }
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget11 **outRT); gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget11 **outRT);
Workarounds GenerateWorkarounds(); Workarounds GenerateWorkarounds();
......
src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
...@@ -539,7 +539,7 @@ void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsize ...@@ -539,7 +539,7 @@ void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsize
*levelOffset = upsampleCount; *levelOffset = upsampleCount;
} }
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget9 **outRT) gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget9 **outRT)
{ {
RenderTarget *renderTarget = NULL; RenderTarget *renderTarget = NULL;
gl::Error error = rx::GetAttachmentRenderTarget(attachment, &renderTarget); gl::Error error = rx::GetAttachmentRenderTarget(attachment, &renderTarget);
......
src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
...@@ -76,7 +76,7 @@ inline bool isDeviceLostError(HRESULT errorCode) ...@@ -76,7 +76,7 @@ inline bool isDeviceLostError(HRESULT errorCode)
} }
} }
gl::Error GetAttachmentRenderTarget(gl::FramebufferAttachment *attachment, RenderTarget9 **outRT); gl::Error GetAttachmentRenderTarget(const gl::FramebufferAttachment *attachment, RenderTarget9 **outRT);
Workarounds GenerateWorkarounds(); Workarounds GenerateWorkarounds();
} }
......
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