Eliminate GL renderbuffers.

src/Radiance/libRAD/Context.cpp

@@ -19,7 +19,6 @@
 #include "utilities.h"
 #include "Fence.h"
 #include "Program.h"
-#include "Renderbuffer.h"
 #include "Shader.h"
 #include "Texture.h"
 #include "libEGL/Display.h"
@@ -577,12 +576,6 @@ GLint Context::getUnpackAlignment() const
     return mState.unpackAlignment;
 }
 
-void Context::setRenderbufferStorage(RenderbufferStorage *renderbuffer)
-{
-    Renderbuffer *renderbufferObject = mState.renderbuffer.get();
-    renderbufferObject->setStorage(renderbuffer);
-}
-
 // Applies the render target surface, depth stencil surface, viewport rectangle and scissor rectangle
 bool Context::applyRenderTarget()
 {

src/Radiance/libRAD/Context.h

@@ -38,27 +38,13 @@ class Config;
 
 namespace es2
 {
-struct TranslatedAttribute;
-struct TranslatedIndexData;
-
 class Device;
-class Buffer;
 class Shader;
 class Program;
 class Texture;
 class Texture2D;
 class TextureCubeMap;
 class TextureExternal;
-class Framebuffer;
-class Renderbuffer;
-class RenderbufferStorage;
-class Colorbuffer;
-class Depthbuffer;
-class StreamingIndexBuffer;
-class Stencilbuffer;
-class DepthStencilbuffer;
-class VertexDataManager;
-class IndexDataManager;
 class Fence;
 
 enum
@@ -204,7 +190,6 @@ struct State
     sw::Resource *elementArrayBuffer;
     GLuint readFramebuffer;
     GLuint drawFramebuffer;
-    BindingPointer<Renderbuffer> renderbuffer;
 	
 	Program *program;
 	egl::Image *colorBuffer;
@@ -298,8 +283,6 @@ public:
     void setPackAlignment(GLint alignment);
     GLint getPackAlignment() const;
 	
-    void setRenderbufferStorage(RenderbufferStorage *renderbuffer);
-	
     void drawArrays(GLenum mode, GLint first, GLsizei count);
     void drawElements(GLenum mode, GLsizei count, GLenum type, intptr_t offset);
     void finish();

src/Radiance/libRAD/Renderbuffer.h

-// SwiftShader Software Renderer
-//
-// Copyright(c) 2005-2013 TransGaming Inc.
-//
-// All rights reserved. No part of this software may be copied, distributed, transmitted,
-// transcribed, stored in a retrieval system, translated into any human or computer
-// language by any means, or disclosed to third parties without the explicit written
-// agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express
-// or implied, including but not limited to any patent rights, are granted to you.
-//
-
-// Renderbuffer.h: Defines the wrapper class Renderbuffer, as well as the
-// class hierarchy used to store its contents: RenderbufferStorage, Colorbuffer,
-// DepthStencilbuffer, Depthbuffer and Stencilbuffer. Implements GL renderbuffer
-// objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108.
-
-#ifndef LIBGLESV2_RENDERBUFFER_H_
-#define LIBGLESV2_RENDERBUFFER_H_
-
-#include "RefCountObject.h"
-#include "Image.hpp"
-
-#define GL_APICALL
-#include <GLES2/gl2.h>
-
-namespace es2
-{
-class Texture2D;
-class TextureCubeMap;
-class Renderbuffer;
-class Colorbuffer;
-class DepthStencilbuffer;
-
-class RenderbufferInterface
-{
-public:
-	RenderbufferInterface();
-
-	virtual ~RenderbufferInterface() {};
-
-	virtual void addProxyRef(const Renderbuffer *proxy);
-    virtual void releaseProxy(const Renderbuffer *proxy);
-
-	virtual egl::Image *getRenderTarget() = 0;
-    virtual egl::Image *createSharedImage() = 0;
-    virtual bool isShared() const = 0;
-
-	virtual GLsizei getWidth() const = 0;
-	virtual GLsizei getHeight() const = 0;
-	virtual GLenum getFormat() const = 0;
-	virtual sw::Format getInternalFormat() const = 0;
-	virtual GLsizei getSamples() const = 0;
-
-	GLuint getRedSize() const;
-	GLuint getGreenSize() const;
-	GLuint getBlueSize() const;
-	GLuint getAlphaSize() const;
-	GLuint getDepthSize() const;
-	GLuint getStencilSize() const;
-};
-
-class RenderbufferTexture2D : public RenderbufferInterface
-{
-public:
-	RenderbufferTexture2D(Texture2D *texture);
-
-	virtual ~RenderbufferTexture2D();
-
-	virtual void addProxyRef(const Renderbuffer *proxy);
-    virtual void releaseProxy(const Renderbuffer *proxy);
-
-	virtual egl::Image *getRenderTarget();
-    virtual egl::Image *createSharedImage();
-    virtual bool isShared() const;
-
-	virtual GLsizei getWidth() const;
-	virtual GLsizei getHeight() const;
-	virtual GLenum getFormat() const;
-	virtual sw::Format getInternalFormat() const;
-	virtual GLsizei getSamples() const;
-
-private:
-	BindingPointer<Texture2D> mTexture2D;
-};
-
-class RenderbufferTextureCubeMap : public RenderbufferInterface
-{
-public:
-	RenderbufferTextureCubeMap(TextureCubeMap *texture, GLenum target);
-
-	virtual ~RenderbufferTextureCubeMap();
-
-	virtual void addProxyRef(const Renderbuffer *proxy);
-    virtual void releaseProxy(const Renderbuffer *proxy);
-
-	virtual Image *getRenderTarget();
-    virtual egl::Image *createSharedImage();
-    virtual bool isShared() const;
-
-	virtual GLsizei getWidth() const;
-	virtual GLsizei getHeight() const;
-	virtual GLenum getFormat() const;
-	virtual sw::Format getInternalFormat() const;
-	virtual GLsizei getSamples() const;
-
-private:
-	BindingPointer<TextureCubeMap> mTextureCubeMap;
-	GLenum mTarget;
-};
-
-// A class derived from RenderbufferStorage is created whenever glRenderbufferStorage
-// is called. The specific concrete type depends on whether the internal format is
-// colour depth, stencil or packed depth/stencil.
-class RenderbufferStorage : public RenderbufferInterface
-{
-public:
-	RenderbufferStorage();
-
-	virtual ~RenderbufferStorage() = 0;
-
-	virtual egl::Image *getRenderTarget() = 0;
-    virtual egl::Image *createSharedImage() = 0;
-    virtual bool isShared() const = 0;
-
-	virtual GLsizei getWidth() const;
-	virtual GLsizei getHeight() const;
-	virtual GLenum getFormat() const;
-	virtual sw::Format getInternalFormat() const;
-	virtual GLsizei getSamples() const;
-
-protected:
-	GLsizei mWidth;
-	GLsizei mHeight;
-	GLenum format;
-	sw::Format internalFormat;
-	GLsizei mSamples;
-};
-
-// Renderbuffer implements the GL renderbuffer object.
-// It's only a proxy for a RenderbufferInterface instance; the internal object
-// can change whenever glRenderbufferStorage is called.
-class Renderbuffer : public RefCountObject
-{
-public:
-	Renderbuffer(GLuint id, RenderbufferInterface *storage);
-
-	virtual ~Renderbuffer();
-
-	// These functions from RefCountObject are overloaded here because
-    // Textures need to maintain their own count of references to them via
-    // Renderbuffers/RenderbufferTextures. These functions invoke those
-    // reference counting functions on the RenderbufferInterface.
-    virtual void addRef();
-    virtual void release();
-
-	egl::Image *getRenderTarget();
-    virtual egl::Image *createSharedImage();
-    virtual bool isShared() const;
-
-	GLsizei getWidth() const;
-	GLsizei getHeight() const;
-	GLenum getFormat() const;
-	sw::Format getInternalFormat() const;
-	GLuint getRedSize() const;
-	GLuint getGreenSize() const;
-	GLuint getBlueSize() const;
-	GLuint getAlphaSize() const;
-	GLuint getDepthSize() const;
-	GLuint getStencilSize() const;
-	GLsizei getSamples() const;
-
-	void setStorage(RenderbufferStorage *newStorage);
-
-private:
-	RenderbufferInterface *mInstance;
-};
-
-class Colorbuffer : public RenderbufferStorage
-{
-public:
-	explicit Colorbuffer(egl::Image *renderTarget);
-	Colorbuffer(GLsizei width, GLsizei height, GLenum format, GLsizei samples);
-
-	virtual ~Colorbuffer();
-
-	virtual egl::Image *getRenderTarget();
-    virtual egl::Image *createSharedImage();
-    virtual bool isShared() const;
-
-private:
-	egl::Image *mRenderTarget;
-};
-
-class DepthStencilbuffer : public RenderbufferStorage
-{
-public:
-	explicit DepthStencilbuffer(egl::Image *depthStencil);
-	DepthStencilbuffer(GLsizei width, GLsizei height, GLsizei samples);
-
-	~DepthStencilbuffer();
-
-	virtual egl::Image *getRenderTarget();
-    virtual egl::Image *createSharedImage();
-    virtual bool isShared() const;
-
-protected:
-	egl::Image *mDepthStencil;
-};
-
-class Depthbuffer : public DepthStencilbuffer
-{
-public:
-	explicit Depthbuffer(egl::Image *depthStencil);
-	Depthbuffer(GLsizei width, GLsizei height, GLsizei samples);
-
-	virtual ~Depthbuffer();
-};
-
-class Stencilbuffer : public DepthStencilbuffer
-{
-public:
-	explicit Stencilbuffer(egl::Image *depthStencil);
-	Stencilbuffer(GLsizei width, GLsizei height, GLsizei samples);
-
-	virtual ~Stencilbuffer();
-};
-}
-
-#endif   // LIBGLESV2_RENDERBUFFER_H_

src/Radiance/libRAD/Texture.cpp

@@ -288,9 +288,6 @@ Texture2D::Texture2D(GLuint id) : Texture(id)
 	}
 
     mSurface = NULL;
-
-	mColorbufferProxy = NULL;
-	mProxyRefs = 0;
 }
 
 Texture2D::~Texture2D()
@@ -313,29 +310,6 @@ Texture2D::~Texture2D()
         mSurface->setBoundTexture(NULL);
         mSurface = NULL;
     }
-
-	mColorbufferProxy = NULL;
-}
-
-// We need to maintain a count of references to renderbuffers acting as 
-// proxies for this texture, so that we do not attempt to use a pointer 
-// to a renderbuffer proxy which has been deleted.
-void Texture2D::addProxyRef(const Renderbuffer *proxy)
-{
-    mProxyRefs++;
-}
-
-void Texture2D::releaseProxy(const Renderbuffer *proxy)
-{
-    if(mProxyRefs > 0)
-	{
-        mProxyRefs--;
-	}
-
-    if(mProxyRefs == 0)
-	{
-		mColorbufferProxy = NULL;
-	}
 }
 
 GLenum Texture2D::getTarget() const
@@ -538,21 +512,6 @@ egl::Image *Texture2D::getImage(unsigned int level)
 	return image[level];
 }
 
-Renderbuffer *Texture2D::getRenderbuffer(GLenum target)
-{
-    if(target != GL_TEXTURE_2D)
-    {
-        return error(GL_INVALID_OPERATION, (Renderbuffer *)NULL);
-    }
-
-    if(mColorbufferProxy == NULL)
-    {
-        mColorbufferProxy = new Renderbuffer(id(), new RenderbufferTexture2D(this));
-    }
-
-    return mColorbufferProxy;
-}
-
 egl::Image *Texture2D::getRenderTarget(GLenum target, unsigned int level)
 {
     ASSERT(target == GL_TEXTURE_2D);
@@ -593,12 +552,6 @@ TextureCubeMap::TextureCubeMap(GLuint id) : Texture(id)
 			image[f][i] = 0;
 		}
 	}
-
-	for(int f = 0; f < 6; f++)
-    {
-        mFaceProxies[f] = NULL;
-        mFaceProxyRefs[f] = 0;
-	}
 }
 
 TextureCubeMap::~TextureCubeMap()
@@ -618,46 +571,6 @@ TextureCubeMap::~TextureCubeMap()
 	}
 
 	resource->unlock();
-
-    for(int i = 0; i < 6; i++)
-    {
-        mFaceProxies[i] = NULL;
-    }
-}
-
-// We need to maintain a count of references to renderbuffers acting as 
-// proxies for this texture, so that the texture is not deleted while 
-// proxy references still exist. If the reference count drops to zero,
-// we set our proxy pointer NULL, so that a new attempt at referencing
-// will cause recreation.
-void TextureCubeMap::addProxyRef(const Renderbuffer *proxy)
-{
-    for(int f = 0; f < 6; f++)
-    {
-        if(mFaceProxies[f] == proxy)
-        {
-			mFaceProxyRefs[f]++;
-		}
-	}
-}
-
-void TextureCubeMap::releaseProxy(const Renderbuffer *proxy)
-{
-    for(int f = 0; f < 6; f++)
-    {
-        if(mFaceProxies[f] == proxy)
-        {
-            if(mFaceProxyRefs[f] > 0)
-			{
-				mFaceProxyRefs[f]--;
-			}
-
-            if(mFaceProxyRefs[f] == 0)
-			{
-				mFaceProxies[f] = NULL;
-			}
-		}
-    }
 }
 
 GLenum TextureCubeMap::getTarget() const
@@ -903,23 +816,6 @@ void TextureCubeMap::generateMipmaps()
 	}
 }
 
-Renderbuffer *TextureCubeMap::getRenderbuffer(GLenum target)
-{
-    if(!IsCubemapTextureTarget(target))
-    {
-        return error(GL_INVALID_OPERATION, (Renderbuffer *)NULL);
-    }
-
-    int face = CubeFaceIndex(target);
-
-    if(mFaceProxies[face] == NULL)
-    {
-        mFaceProxies[face] = new Renderbuffer(id(), new RenderbufferTextureCubeMap(this, target));
-    }
-
-    return mFaceProxies[face];
-}
-
 Image *TextureCubeMap::getRenderTarget(GLenum target, unsigned int level)
 {
     ASSERT(IsCubemapTextureTarget(target));

src/Radiance/libRAD/Texture.h

@@ -16,7 +16,6 @@
 #ifndef LIBGLESV2_TEXTURE_H_
 #define LIBGLESV2_TEXTURE_H_
 
-#include "Renderbuffer.h"
 #include "RefCountObject.h"
 #include "utilities.h"
 #include "libEGL/Texture2D.hpp"
@@ -54,10 +53,7 @@ public:
     virtual ~Texture();
 
 	sw::Resource *getResource() const;
-
-	virtual void addProxyRef(const Renderbuffer *proxy) = 0;
-    virtual void releaseProxy(const Renderbuffer *proxy) = 0;
-
+	
     virtual GLenum getTarget() const = 0;
 
     bool setMinFilter(GLenum filter);
@@ -83,7 +79,6 @@ public:
     virtual bool isCompressed(GLenum target, GLint level) const = 0;
 	virtual bool isDepth(GLenum target, GLint level) const = 0;
 
-    virtual Renderbuffer *getRenderbuffer(GLenum target) = 0;
     virtual egl::Image *getRenderTarget(GLenum target, unsigned int level) = 0;
     virtual egl::Image *createSharedImage(GLenum target, unsigned int level);
     virtual bool isShared(GLenum target, unsigned int level) const = 0;
@@ -115,10 +110,7 @@ public:
     explicit Texture2D(GLuint id);
 
     virtual ~Texture2D();
-
-	void addProxyRef(const Renderbuffer *proxy);
-    void releaseProxy(const Renderbuffer *proxy);
-
+	
     virtual GLenum getTarget() const;
 
     virtual GLsizei getWidth(GLenum target, GLint level) const;
@@ -139,7 +131,6 @@ public:
 
     virtual void generateMipmaps();
 
-	virtual Renderbuffer *getRenderbuffer(GLenum target);
     virtual egl::Image *getRenderTarget(GLenum target, unsigned int level);
 	virtual bool isShared(GLenum target, unsigned int level) const;
 
@@ -151,14 +142,6 @@ protected:
 	egl::Image *image[IMPLEMENTATION_MAX_TEXTURE_LEVELS];
     
     egl::Surface *mSurface;
-    
-	// A specific internal reference count is kept for colorbuffer proxy references,
-    // because, as the renderbuffer acting as proxy will maintain a binding pointer
-    // back to this texture, there would be a circular reference if we used a binding
-    // pointer here. This reference count will cause the pointer to be set to NULL if
-    // the count drops to zero, but will not cause deletion of the Renderbuffer.
-    Renderbuffer *mColorbufferProxy;
-    unsigned int mProxyRefs;
 };
 
 class TextureCubeMap : public Texture
@@ -168,9 +151,6 @@ public:
 
     virtual ~TextureCubeMap();
 
-	void addProxyRef(const Renderbuffer *proxy);
-    void releaseProxy(const Renderbuffer *proxy);
-
     virtual GLenum getTarget() const;
     
     virtual GLsizei getWidth(GLenum target, GLint level) const;
@@ -192,7 +172,6 @@ public:
 
     virtual void generateMipmaps();
 
-    virtual Renderbuffer *getRenderbuffer(GLenum target);
 	virtual Image *getRenderTarget(GLenum target, unsigned int level);
 	virtual bool isShared(GLenum target, unsigned int level) const;
 
@@ -206,14 +185,6 @@ private:
     Image *getImage(GLenum face, unsigned int level);
 
     Image *image[6][IMPLEMENTATION_MAX_TEXTURE_LEVELS];
-	
-	// A specific internal reference count is kept for colorbuffer proxy references,
-    // because, as the renderbuffer acting as proxy will maintain a binding pointer
-    // back to this texture, there would be a circular reference if we used a binding
-    // pointer here. This reference count will cause the pointer to be set to NULL if
-    // the count drops to zero, but will not cause deletion of the Renderbuffer.
-    Renderbuffer *mFaceProxies[6];
-	unsigned int mFaceProxyRefs[6];
 };
 
 class TextureExternal : public Texture2D

src/Radiance/libRAD/libRAD.vcxproj

@@ -169,7 +169,6 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman
     <ClCompile Include="main.cpp" />
     <ClCompile Include="Program.cpp" />
     <ClCompile Include="RefCountObject.cpp" />
-    <ClCompile Include="Renderbuffer.cpp" />
     <ClCompile Include="Shader.cpp" />
     <ClCompile Include="Texture.cpp" />
     <ClCompile Include="utilities.cpp" />
@@ -187,7 +186,6 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman
     <ClInclude Include="mathutil.h" />
     <ClInclude Include="Program.h" />
     <ClInclude Include="RefCountObject.h" />
-    <ClInclude Include="Renderbuffer.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Shader.h" />
     <ClInclude Include="Texture.h" />

src/Radiance/libRAD/libRAD.vcxproj.filters

@@ -32,9 +32,6 @@
     <ClCompile Include="RefCountObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Renderbuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Shader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -70,9 +67,6 @@
     <ClInclude Include="RefCountObject.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Renderbuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>