Skip to content

A
angle
Commit 3b57b4fc by shannon.woods%transgaming.com@gtempaccount.com
Options

Add const qualifiers to several methods in gl::Framebuffer.

TRAC #22656 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2064 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 9790c470
Showing with 41 additions and 40 deletions
src/libGLESv2/Framebuffer.cpp
#include "precompiled.h" #include "precompiled.h"
// //
// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -120,7 +120,7 @@ void Framebuffer::detachRenderbuffer(GLuint renderbuffer) ...@@ -120,7 +120,7 @@ void Framebuffer::detachRenderbuffer(GLuint renderbuffer)
} }
} }
unsigned int Framebuffer::getRenderTargetSerial() unsigned int Framebuffer::getRenderTargetSerial() const
{ {
Renderbuffer *colorbuffer = mColorbufferPointer.get(); Renderbuffer *colorbuffer = mColorbufferPointer.get();
...@@ -132,7 +132,7 @@ unsigned int Framebuffer::getRenderTargetSerial() ...@@ -132,7 +132,7 @@ unsigned int Framebuffer::getRenderTargetSerial()
return 0; return 0;
} }
unsigned int Framebuffer::getDepthbufferSerial() unsigned int Framebuffer::getDepthbufferSerial() const
{ {
Renderbuffer *depthbuffer = mDepthbufferPointer.get(); Renderbuffer *depthbuffer = mDepthbufferPointer.get();
...@@ -144,7 +144,7 @@ unsigned int Framebuffer::getDepthbufferSerial() ...@@ -144,7 +144,7 @@ unsigned int Framebuffer::getDepthbufferSerial()
return 0; return 0;
} }
unsigned int Framebuffer::getStencilbufferSerial() unsigned int Framebuffer::getStencilbufferSerial() const
{ {
Renderbuffer *stencilbuffer = mStencilbufferPointer.get(); Renderbuffer *stencilbuffer = mStencilbufferPointer.get();
...@@ -156,22 +156,22 @@ unsigned int Framebuffer::getStencilbufferSerial() ...@@ -156,22 +156,22 @@ unsigned int Framebuffer::getStencilbufferSerial()
return 0; return 0;
} }
Renderbuffer *Framebuffer::getColorbuffer() Renderbuffer *Framebuffer::getColorbuffer() const
{ {
return mColorbufferPointer.get(); return mColorbufferPointer.get();
} }
Renderbuffer *Framebuffer::getDepthbuffer() Renderbuffer *Framebuffer::getDepthbuffer() const
{ {
return mDepthbufferPointer.get(); return mDepthbufferPointer.get();
} }
Renderbuffer *Framebuffer::getStencilbuffer() Renderbuffer *Framebuffer::getStencilbuffer() const
{ {
return mStencilbufferPointer.get(); return mStencilbufferPointer.get();
} }
Renderbuffer *Framebuffer::getDepthOrStencilbuffer() Renderbuffer *Framebuffer::getDepthOrStencilbuffer() const
{ {
Renderbuffer *depthstencilbuffer = mDepthbufferPointer.get(); Renderbuffer *depthstencilbuffer = mDepthbufferPointer.get();
...@@ -183,41 +183,41 @@ Renderbuffer *Framebuffer::getDepthOrStencilbuffer() ...@@ -183,41 +183,41 @@ Renderbuffer *Framebuffer::getDepthOrStencilbuffer()
return depthstencilbuffer; return depthstencilbuffer;
} }
GLenum Framebuffer::getColorbufferType() GLenum Framebuffer::getColorbufferType() const
{ {
return mColorbufferType; return mColorbufferType;
} }
GLenum Framebuffer::getDepthbufferType() GLenum Framebuffer::getDepthbufferType() const
{ {
return mDepthbufferType; return mDepthbufferType;
} }
GLenum Framebuffer::getStencilbufferType() GLenum Framebuffer::getStencilbufferType() const
{ {
return mStencilbufferType; return mStencilbufferType;
} }
GLuint Framebuffer::getColorbufferHandle() GLuint Framebuffer::getColorbufferHandle() const
{ {
return mColorbufferPointer.id(); return mColorbufferPointer.id();
} }
GLuint Framebuffer::getDepthbufferHandle() GLuint Framebuffer::getDepthbufferHandle() const
{ {
return mDepthbufferPointer.id(); return mDepthbufferPointer.id();
} }
GLuint Framebuffer::getStencilbufferHandle() GLuint Framebuffer::getStencilbufferHandle() const
{ {
return mStencilbufferPointer.id(); return mStencilbufferPointer.id();
} }
bool Framebuffer::hasStencil() bool Framebuffer::hasStencil() const
{ {
if (mStencilbufferType != GL_NONE) if (mStencilbufferType != GL_NONE)
{ {
Renderbuffer *stencilbufferObject = getStencilbuffer(); const Renderbuffer *stencilbufferObject = getStencilbuffer();
if (stencilbufferObject) if (stencilbufferObject)
{ {
...@@ -228,7 +228,7 @@ bool Framebuffer::hasStencil() ...@@ -228,7 +228,7 @@ bool Framebuffer::hasStencil()
return false; return false;
} }
GLenum Framebuffer::completeness() GLenum Framebuffer::completeness() const
{ {
int width = 0; int width = 0;
int height = 0; int height = 0;
...@@ -237,7 +237,7 @@ GLenum Framebuffer::completeness() ...@@ -237,7 +237,7 @@ GLenum Framebuffer::completeness()
if (mColorbufferType != GL_NONE) if (mColorbufferType != GL_NONE)
{ {
Renderbuffer *colorbuffer = getColorbuffer(); const Renderbuffer *colorbuffer = getColorbuffer();
if (!colorbuffer) if (!colorbuffer)
{ {
...@@ -294,8 +294,8 @@ GLenum Framebuffer::completeness() ...@@ -294,8 +294,8 @@ GLenum Framebuffer::completeness()
missingAttachment = false; missingAttachment = false;
} }
Renderbuffer *depthbuffer = NULL; const Renderbuffer *depthbuffer = NULL;
Renderbuffer *stencilbuffer = NULL; const Renderbuffer *stencilbuffer = NULL;
if (mDepthbufferType != GL_NONE) if (mDepthbufferType != GL_NONE)
{ {
...@@ -446,7 +446,7 @@ DefaultFramebuffer::DefaultFramebuffer(rx::Renderer *renderer, Colorbuffer *colo ...@@ -446,7 +446,7 @@ DefaultFramebuffer::DefaultFramebuffer(rx::Renderer *renderer, Colorbuffer *colo
mStencilbufferType = (depthStencilRenderbuffer->getStencilSize() != 0) ? GL_RENDERBUFFER : GL_NONE; mStencilbufferType = (depthStencilRenderbuffer->getStencilSize() != 0) ? GL_RENDERBUFFER : GL_NONE;
} }
int Framebuffer::getSamples() int Framebuffer::getSamples() const
{ {
if (completeness() == GL_FRAMEBUFFER_COMPLETE) if (completeness() == GL_FRAMEBUFFER_COMPLETE)
{ {
...@@ -458,7 +458,7 @@ int Framebuffer::getSamples() ...@@ -458,7 +458,7 @@ int Framebuffer::getSamples()
} }
} }
GLenum DefaultFramebuffer::completeness() GLenum DefaultFramebuffer::completeness() const
{ {
// The default framebuffer *must* always be complete, though it may not be // The default framebuffer *must* always be complete, though it may not be
// subject to the same rules as application FBOs. ie, it could have 0x0 size. // subject to the same rules as application FBOs. ie, it could have 0x0 size.
......
src/libGLESv2/Framebuffer.h
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "common/RefCountObject.h"
#include "constants.h"
namespace rx namespace rx
{ {
...@@ -40,27 +41,27 @@ class Framebuffer ...@@ -40,27 +41,27 @@ class Framebuffer
void detachTexture(GLuint texture); void detachTexture(GLuint texture);
void detachRenderbuffer(GLuint renderbuffer); void detachRenderbuffer(GLuint renderbuffer);
unsigned int getRenderTargetSerial(); unsigned int getRenderTargetSerial() const;
unsigned int getDepthbufferSerial(); unsigned int getDepthbufferSerial() const;
unsigned int getStencilbufferSerial(); unsigned int getStencilbufferSerial() const;
Renderbuffer *getColorbuffer(); Renderbuffer *getColorbuffer() const;
Renderbuffer *getDepthbuffer(); Renderbuffer *getDepthbuffer() const;
Renderbuffer *getStencilbuffer(); Renderbuffer *getStencilbuffer() const;
Renderbuffer *getDepthOrStencilbuffer(); Renderbuffer *getDepthOrStencilbuffer() const;
GLenum getColorbufferType(); GLenum getColorbufferType() const;
GLenum getDepthbufferType(); GLenum getDepthbufferType() const;
GLenum getStencilbufferType(); GLenum getStencilbufferType() const;
GLuint getColorbufferHandle(); GLuint getColorbufferHandle() const;
GLuint getDepthbufferHandle(); GLuint getDepthbufferHandle() const;
GLuint getStencilbufferHandle(); GLuint getStencilbufferHandle() const;
bool hasStencil(); bool hasStencil() const;
int getSamples(); int getSamples() const;
virtual GLenum completeness(); virtual GLenum completeness() const;
protected: protected:
GLenum mColorbufferType; GLenum mColorbufferType;
...@@ -85,7 +86,7 @@ class DefaultFramebuffer : public Framebuffer ...@@ -85,7 +86,7 @@ class DefaultFramebuffer : public Framebuffer
public: public:
DefaultFramebuffer(rx::Renderer *Renderer, Colorbuffer *colorbuffer, DepthStencilbuffer *depthStencil); DefaultFramebuffer(rx::Renderer *Renderer, Colorbuffer *colorbuffer, DepthStencilbuffer *depthStencil);
virtual GLenum completeness(); virtual GLenum completeness() const;
private: private:
DISALLOW_COPY_AND_ASSIGN(DefaultFramebuffer); DISALLOW_COPY_AND_ASSIGN(DefaultFramebuffer);
......
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