Eliminate GL resource manager.

src/Radiance/libEGL/Context.hpp

@@ -16,9 +16,6 @@ class Context
 public:
 	virtual void destroy() = 0;
 	virtual void makeCurrent(Surface *surface) = 0;
-	virtual void bindTexImage(Surface *surface) = 0;
-	virtual EGLenum validateSharedImage(EGLenum target, GLuint name, GLuint textureLevel) = 0;
-	virtual Image *createSharedImage(EGLenum target, GLuint name, GLuint textureLevel) = 0;
 	virtual int getClientVersion() = 0;
 };
 }

src/Radiance/libEGL/Surface.cpp

@@ -88,13 +88,7 @@ void Surface::release()
         mDepthStencil->release();
         mDepthStencil = NULL;
     }
-
-    if(mTexture)
-    {
-        mTexture->releaseTexImage();
-        mTexture = NULL;
-    }
-
+	
 	if(backBuffer)
 	{
 		backBuffer->release();

src/Radiance/libEGL/Texture2D.hpp

@@ -6,7 +6,6 @@ namespace egl
 class Texture2D
 {
 public:
-	virtual void releaseTexImage() = 0;
 };
 }
 

src/Radiance/libEGL/libEGL.cpp

@@ -629,103 +629,6 @@ EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLi
     return EGL_FALSE;
 }
 
-EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
-{
-    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer);
-
-    try
-    {
-        egl::Display *display = static_cast<egl::Display*>(dpy);
-        egl::Surface *eglSurface = static_cast<egl::Surface*>(surface);
-
-        if(!validateSurface(display, eglSurface))
-        {
-            return EGL_FALSE;
-        }
-
-        if(buffer != EGL_BACK_BUFFER)
-        {
-            return error(EGL_BAD_PARAMETER, EGL_FALSE);
-        }
-
-        if(surface == EGL_NO_SURFACE || eglSurface->getWindowHandle())
-        {
-            return error(EGL_BAD_SURFACE, EGL_FALSE);
-        }
-
-        if(eglSurface->getBoundTexture())
-        {
-            return error(EGL_BAD_ACCESS, EGL_FALSE);
-        }
-
-        if(eglSurface->getTextureFormat() == EGL_NO_TEXTURE)
-        {
-            return error(EGL_BAD_MATCH, EGL_FALSE);
-        }
-
-		egl::Context *context = static_cast<egl::Context*>(egl::getCurrentContext());
-
-		if(context)
-		{
-			context->bindTexImage(eglSurface);
-		}
-
-        return success(EGL_TRUE);
-    }
-    catch(std::bad_alloc&)
-    {
-        return error(EGL_BAD_ALLOC, EGL_FALSE);
-    }
-
-    return EGL_FALSE;
-}
-
-EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
-{
-    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer);
-
-    try
-    {
-        egl::Display *display = static_cast<egl::Display*>(dpy);
-        egl::Surface *eglSurface = static_cast<egl::Surface*>(surface);
-
-        if(!validateSurface(display, eglSurface))
-        {
-            return EGL_FALSE;
-        }
-
-        if(buffer != EGL_BACK_BUFFER)
-        {
-            return error(EGL_BAD_PARAMETER, EGL_FALSE);
-        }
-
-        if(surface == EGL_NO_SURFACE || eglSurface->getWindowHandle())
-        {
-            return error(EGL_BAD_SURFACE, EGL_FALSE);
-        }
-
-        if(eglSurface->getTextureFormat() == EGL_NO_TEXTURE)
-        {
-            return error(EGL_BAD_MATCH, EGL_FALSE);
-        }
-
-        egl::Texture2D *texture = eglSurface->getBoundTexture();
-
-        if(texture)
-        {
-            texture->releaseTexImage();
-        }
-
-        return success(EGL_TRUE);
-    }
-    catch(std::bad_alloc&)
-    {
-        return error(EGL_BAD_ALLOC, EGL_FALSE);
-    }
-
-    return EGL_FALSE;
-}
-
 EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)
 {
     TRACE("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval);
@@ -1078,149 +981,15 @@ EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNat
     return EGL_FALSE;
 }
 
-EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)
-{
-    try
-    {
-        egl::Display *display = static_cast<egl::Display*>(dpy);
-        egl::Context *context = static_cast<egl::Context*>(ctx);
-
-        if(!validateDisplay(display))
-        {
-            return error(EGL_BAD_DISPLAY, EGL_NO_IMAGE_KHR);
-        }
-
-        if(context != EGL_NO_CONTEXT && !display->isValidContext(context))
-        {
-            return error(EGL_BAD_CONTEXT, EGL_NO_IMAGE_KHR);
-        }
-
-        EGLenum imagePreserved = EGL_FALSE;
-        GLuint textureLevel = 0;
-        if(attrib_list)
-        {
-            for(const EGLint *attribute = attrib_list; attribute[0] != EGL_NONE; attribute += 2)
-            {
-                if(attribute[0] == EGL_IMAGE_PRESERVED_KHR)
-                {
-                    imagePreserved = attribute[1];
-                }
-                else if(attribute[0] == EGL_GL_TEXTURE_LEVEL_KHR)
-                {
-                    textureLevel = attribute[1];
-                }
-                else
-                {
-                    return error(EGL_BAD_ATTRIBUTE, EGL_NO_IMAGE_KHR);
-                }
-            }
-        }
-
-        GLuint name = reinterpret_cast<intptr_t>(buffer);
-
-        if(name == 0)
-        {
-            return error(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
-        }
-
-		EGLenum validationResult = context->validateSharedImage(target, name, textureLevel);
-
-		if(validationResult != EGL_SUCCESS)
-		{
-			return error(validationResult, EGL_NO_IMAGE_KHR);
-		}
-
-        egl::Image *image = context->createSharedImage(target, name, textureLevel);
-
-        if(!image)
-        {
-            return error(EGL_BAD_MATCH, EGL_NO_IMAGE_KHR);
-        }
-
-        if(image->getMultiSampleDepth() > 1)
-        {
-            return error(EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
-        }
-
-        return success((EGLImageKHR)image);
-    }
-    catch(std::bad_alloc&)
-    {
-        return error(EGL_BAD_ALLOC, EGL_NO_IMAGE_KHR);
-    }
-
-    return EGL_NO_IMAGE_KHR;
-}
-
-EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
-{
-    try
-    {
-        egl::Display *display = static_cast<egl::Display*>(dpy);
-
-        if(!validateDisplay(display))
-        {
-            return error(EGL_BAD_DISPLAY, EGL_FALSE);
-        }
-
-        if(!image)
-        {
-            return error(EGL_BAD_PARAMETER, EGL_FALSE);
-        }
-
-        egl::Image *glImage = static_cast<egl::Image*>(image);
-        glImage->release();
-
-        return success(EGL_TRUE);
-    }
-    catch(std::bad_alloc&)
-    {
-        return error(EGL_BAD_ALLOC, EGL_FALSE);
-    }
-
-    return EGL_FALSE;
-}
-
 __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)
 {
     TRACE("(const char *procname = \"%s\")", procname);
-
-    try
-    {
-        struct Extension
-        {
-            const char *name;
-            __eglMustCastToProperFunctionPointerType address;
-        };
-
-        static const Extension eglExtensions[] =
-        {
-			#define EXTENSION(name) {#name, (__eglMustCastToProperFunctionPointerType)name}
-
-			EXTENSION(eglCreateImageKHR),
-			EXTENSION(eglDestroyImageKHR),
-
-			#undef EXTENSION
-		};
-
-        for(int ext = 0; ext < sizeof(eglExtensions) / sizeof(Extension); ext++)
-        {
-            if(strcmp(procname, eglExtensions[ext].name) == 0)
-            {
-                return (__eglMustCastToProperFunctionPointerType)eglExtensions[ext].address;
-            }
-        }
-
-		if(rad::getProcAddress != 0)
-		{
-			__eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);
-			if(proc) return proc;
-		}
-    }
-    catch(std::bad_alloc&)
-    {
-        return error(EGL_BAD_ALLOC, (__eglMustCastToProperFunctionPointerType)NULL);
-    }
+	
+	if(rad::getProcAddress != 0)
+	{
+		__eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);
+		if(proc) return proc;
+	}
 
     return NULL;
 }

src/Radiance/libEGL/libEGL.def

 LIBRARY	libEGL
 EXPORTS
 	eglBindAPI                      @14
-	eglBindTexImage                 @20
 	eglChooseConfig                 @7
 	eglCopyBuffers                  @33
 	eglCreateContext                @23
@@ -25,7 +24,6 @@ EXPORTS
 	eglQueryContext                 @29
 	eglQueryString                  @5
 	eglQuerySurface                 @13
-	eglReleaseTexImage              @21
 	eglReleaseThread                @17
 	eglSurfaceAttrib                @19
 	eglSwapBuffers                  @32

src/Radiance/libRAD/Context.h

@@ -16,7 +16,6 @@
 #define LIBGLESV2_CONTEXT_H_
 
 #include "libEGL/Context.hpp"
-#include "ResourceManager.h"
 #include "HandleAllocator.h"
 #include "RefCountObject.h"
 #include "Image.hpp"
@@ -216,15 +215,14 @@ struct State
     GLuint readFramebuffer;
     GLuint drawFramebuffer;
     BindingPointer<Renderbuffer> renderbuffer;
-    GLuint currentProgram;
 	
 	Program *program;
 	egl::Image *colorBuffer;
 	egl::Image *depthBuffer;
+	egl::Image *stencilBuffer;
 
     VertexAttribute vertexAttribute[MAX_VERTEX_ATTRIBS];
-    BindingPointer<Texture> samplerTexture[TEXTURE_TYPE_COUNT][MAX_COMBINED_TEXTURE_IMAGE_UNITS];
-	BindingPointer<Query> activeQuery[QUERY_TYPE_COUNT];
+    BindingPointer<Query> activeQuery[QUERY_TYPE_COUNT];
 
     GLint unpackAlignment;
     GLint packAlignment;
@@ -300,10 +298,6 @@ public:
 
     void setActiveSampler(unsigned int active);
 
-    GLuint getReadFramebufferHandle() const;
-    GLuint getDrawFramebufferHandle() const;
-    GLuint getRenderbufferHandle() const;
-
 	GLuint getActiveQuery(GLenum target) const;
 
     void setEnableVertexAttribArray(unsigned int attribNum, bool enabled);
@@ -318,64 +312,9 @@ public:
 
     void setPackAlignment(GLint alignment);
     GLint getPackAlignment() const;
-
-    // These create  and destroy methods are merely pass-throughs to 
-    // ResourceManager, which owns these object types
-    GLuint createShader(GLenum type);
-    GLuint createProgram();
-    GLuint createTexture();
-    GLuint createRenderbuffer();
-
-    void deleteShader(GLuint shader);
-    void deleteProgram(GLuint program);
-    void deleteTexture(GLuint texture);
-    void deleteRenderbuffer(GLuint renderbuffer);
-
-    // Framebuffers are owned by the Context, so these methods do not pass through
-    GLuint createFramebuffer();
-    void deleteFramebuffer(GLuint framebuffer);
-
-    // Fences are owned by the Context
-    GLuint createFence();
-    void deleteFence(GLuint fence);
-
-	// Queries are owned by the Context
-    GLuint createQuery();
-    void deleteQuery(GLuint query);
-
-    void bindTexture2D(GLuint texture);
-    void bindTextureCubeMap(GLuint texture);
-    void bindTextureExternal(GLuint texture);
-    void bindReadFramebuffer(GLuint framebuffer);
-    void bindDrawFramebuffer(GLuint framebuffer);
-    void bindRenderbuffer(GLuint renderbuffer);
-    void useProgram(GLuint program);
-
-	void beginQuery(GLenum target, GLuint query);
-    void endQuery(GLenum target);
-
-    void setFramebufferZero(Framebuffer *framebuffer);
-
+	
     void setRenderbufferStorage(RenderbufferStorage *renderbuffer);
-
-    Fence *getFence(GLuint handle);
-    Shader *getShader(GLuint handle);
-    Program *getProgram(GLuint handle);
-    virtual Texture *getTexture(GLuint handle);
-    Framebuffer *getFramebuffer(GLuint handle);
-    virtual Renderbuffer *getRenderbuffer(GLuint handle);
-	Query *getQuery(GLuint handle, bool create, GLenum type);
-
-    Program *getCurrentProgram();
-    Texture2D *getTexture2D();
-    TextureCubeMap *getTextureCubeMap();
-    TextureExternal *getTextureExternal();
-    Texture *getSamplerTexture(unsigned int sampler, TextureType type);
-    Framebuffer *getReadFramebuffer();
-    Framebuffer *getDrawFramebuffer();
-
-    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei *bufSize, void* pixels);
-    void clear(GLbitfield mask);
+	
     void drawArrays(GLenum mode, GLint first, GLsizei count);
     void drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices);
     void finish();
@@ -390,15 +329,7 @@ public:
     GLenum getError();
 
     static int getSupportedMultiSampleDepth(sw::Format format, int requested);
-    
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, 
-                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                         GLbitfield mask);
-
-	virtual void bindTexImage(egl::Surface *surface);
-	virtual EGLenum validateSharedImage(EGLenum target, GLuint name, GLuint textureLevel);
-	virtual egl::Image *createSharedImage(EGLenum target, GLuint name, GLuint textureLevel);
-
+    	
 	Device *getDevice();
 
 public:
@@ -409,14 +340,8 @@ public:
     GLenum applyVertexBuffer(GLint base, GLint first, GLsizei count);
     GLenum applyIndexBuffer(const void *indices, GLsizei count, GLenum mode, GLenum type, TranslatedIndexData *indexInfo);
     void applyShaders();
-    void applyTextures();
-    void applyTextures(sw::SamplerType type);
 	void applyTexture(sw::SamplerType type, int sampler, Texture *texture);
 
-    void detachTexture(GLuint texture);
-    void detachFramebuffer(GLuint framebuffer);
-    void detachRenderbuffer(GLuint renderbuffer);
-
     bool cullSkipsDraw(GLenum drawMode);
     bool isTriangleMode(GLenum drawMode);
 
@@ -424,10 +349,6 @@ public:
 
     State mState;
 
-    BindingPointer<Texture2D> mTexture2DZero;
-    BindingPointer<TextureCubeMap> mTextureCubeMapZero;
-    BindingPointer<TextureExternal> mTextureExternalZero;
-
     typedef std::map<GLint, Framebuffer*> FramebufferMap;
     FramebufferMap mFramebufferMap;
     HandleAllocator mFramebufferHandleAllocator;
@@ -464,10 +385,8 @@ public:
     bool mSampleStateDirty;
     bool mFrontFaceDirty;
     bool mDitherStateDirty;
-
-    ResourceManager *mResourceManager;
-
-	static Device *device;
+	
+	Device *device;
 };
 }
 

src/Radiance/libRAD/Framebuffer.cpp

@@ -47,11 +47,11 @@ Renderbuffer *Framebuffer::lookupRenderbuffer(GLenum type, GLuint handle) const
 	}
 	else if(type == GL_RENDERBUFFER)
 	{
-		buffer = context->getRenderbuffer(handle);
+		//buffer = context->getRenderbuffer(handle);
 	}
 	else if(IsTextureTarget(type))
 	{
-		buffer = context->getTexture(handle)->getRenderbuffer(type);
+		//buffer = context->getTexture(handle)->getRenderbuffer(type);
 	}
 	else
 	{

src/Radiance/libRAD/Image.cpp

@@ -53,7 +53,7 @@ namespace es2
 	{
 		if(parentTexture)
 		{
-			parentTexture->addRef();
+			return parentTexture->addRef();
 		}
 
 		sw::atomicIncrement(&referenceCount);
@@ -63,7 +63,7 @@ namespace es2
 	{
 		if(parentTexture)
 		{
-			parentTexture->release();
+			return parentTexture->release();
 		}
 
 		if(referenceCount > 0)

src/Radiance/libRAD/Program.cpp

@@ -70,7 +70,7 @@ namespace es2
 	{
 	}
 
-	Program::Program(ResourceManager *manager, GLuint handle) : resourceManager(manager), handle(handle), serial(issueSerial())
+	Program::Program(GLuint handle) : handle(handle), serial(issueSerial())
 	{
 		device = getDevice();
 
@@ -1965,9 +1965,9 @@ namespace es2
 	{
 		referenceCount--;
 
-		if(referenceCount == 0 && orphaned)
+		if(referenceCount == 0)
 		{
-			resourceManager->deleteProgram(handle);
+			delete this;
 		}
 	}
 

src/Radiance/libRAD/Program.h

@@ -27,7 +27,6 @@
 namespace es2
 {
 	class Device;
-	class ResourceManager;
 	class FragmentShader;
 	class VertexShader;
 
@@ -64,10 +63,20 @@ namespace es2
 		unsigned int index;
 	};
 
+	enum TextureType
+	{
+		TEXTURE_2D,
+		TEXTURE_CUBE,
+		TEXTURE_EXTERNAL,
+
+		TEXTURE_TYPE_COUNT,
+		TEXTURE_UNKNOWN
+	};
+
 	class Program
 	{
 	public:
-		Program(ResourceManager *manager, GLuint handle);
+		Program(GLuint handle);
 
 		~Program();
 
@@ -199,7 +208,6 @@ namespace es2
 
 		static unsigned int currentSerial;
 
-		ResourceManager *resourceManager;
 		const GLuint handle;
 	};
 }

src/Radiance/libRAD/ResourceManager.cpp

-// SwiftShader Software Renderer
-//
-// Copyright(c) 2005-2012 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.
-//
-
-// ResourceManager.cpp: Implements the ResourceManager class, which tracks and 
-// retrieves objects which may be shared by multiple Contexts.
-
-#include "ResourceManager.h"
-
-#include "Buffer.h"
-#include "Program.h"
-#include "Renderbuffer.h"
-#include "Shader.h"
-#include "Texture.h"
-
-namespace es2
-{
-ResourceManager::ResourceManager()
-{
-    mRefCount = 1;
-}
-
-ResourceManager::~ResourceManager()
-{
-    while(!mProgramMap.empty())
-    {
-        deleteProgram(mProgramMap.begin()->first);
-    }
-
-    while(!mShaderMap.empty())
-    {
-        deleteShader(mShaderMap.begin()->first);
-    }
-
-    while(!mRenderbufferMap.empty())
-    {
-        deleteRenderbuffer(mRenderbufferMap.begin()->first);
-    }
-
-    while(!mTextureMap.empty())
-    {
-        deleteTexture(mTextureMap.begin()->first);
-    }
-}
-
-void ResourceManager::addRef()
-{
-    mRefCount++;
-}
-
-void ResourceManager::release()
-{
-    if(--mRefCount == 0)
-    {
-        delete this;
-    }
-}
-
-// Returns an unused shader/program name
-GLuint ResourceManager::createShader(GLenum type)
-{
-    GLuint handle = mProgramShaderHandleAllocator.allocate();
-
-    if(type == GL_VERTEX_SHADER)
-    {
-        mShaderMap[handle] = new VertexShader(this, handle);
-    }
-    else if(type == GL_FRAGMENT_SHADER)
-    {
-        mShaderMap[handle] = new FragmentShader(this, handle);
-    }
-    else UNREACHABLE();
-
-    return handle;
-}
-
-// Returns an unused program/shader name
-GLuint ResourceManager::createProgram()
-{
-    GLuint handle = mProgramShaderHandleAllocator.allocate();
-
-    mProgramMap[handle] = new Program(this, handle);
-
-    return handle;
-}
-
-// Returns an unused texture name
-GLuint ResourceManager::createTexture()
-{
-    GLuint handle = mTextureHandleAllocator.allocate();
-
-    mTextureMap[handle] = NULL;
-
-    return handle;
-}
-
-// Returns an unused renderbuffer name
-GLuint ResourceManager::createRenderbuffer()
-{
-    GLuint handle = mRenderbufferHandleAllocator.allocate();
-
-    mRenderbufferMap[handle] = NULL;
-
-    return handle;
-}
-
-void ResourceManager::deleteShader(GLuint shader)
-{
-    ShaderMap::iterator shaderObject = mShaderMap.find(shader);
-
-    if(shaderObject != mShaderMap.end())
-    {
-        if(shaderObject->second->getRefCount() == 0)
-        {
-            mProgramShaderHandleAllocator.release(shaderObject->first);
-            delete shaderObject->second;
-            mShaderMap.erase(shaderObject);
-        }
-        else
-        {
-            shaderObject->second->flagForDeletion();
-        }
-    }
-}
-
-void ResourceManager::deleteProgram(GLuint program)
-{
-    ProgramMap::iterator programObject = mProgramMap.find(program);
-
-    if(programObject != mProgramMap.end())
-    {
-        if(programObject->second->getRefCount() == 0)
-        {
-            mProgramShaderHandleAllocator.release(programObject->first);
-            delete programObject->second;
-            mProgramMap.erase(programObject);
-        }
-        else
-        { 
-            programObject->second->flagForDeletion();
-        }
-    }
-}
-
-void ResourceManager::deleteTexture(GLuint texture)
-{
-    TextureMap::iterator textureObject = mTextureMap.find(texture);
-
-    if(textureObject != mTextureMap.end())
-    {
-        mTextureHandleAllocator.release(textureObject->first);
-        if(textureObject->second) textureObject->second->release();
-        mTextureMap.erase(textureObject);
-    }
-}
-
-void ResourceManager::deleteRenderbuffer(GLuint renderbuffer)
-{
-    RenderbufferMap::iterator renderbufferObject = mRenderbufferMap.find(renderbuffer);
-
-    if(renderbufferObject != mRenderbufferMap.end())
-    {
-        mRenderbufferHandleAllocator.release(renderbufferObject->first);
-        if(renderbufferObject->second) renderbufferObject->second->release();
-        mRenderbufferMap.erase(renderbufferObject);
-    }
-}
-
-Shader *ResourceManager::getShader(unsigned int handle)
-{
-    ShaderMap::iterator shader = mShaderMap.find(handle);
-
-    if(shader == mShaderMap.end())
-    {
-        return NULL;
-    }
-    else
-    {
-        return shader->second;
-    }
-}
-
-Texture *ResourceManager::getTexture(unsigned int handle)
-{
-    if(handle == 0) return NULL;
-
-    TextureMap::iterator texture = mTextureMap.find(handle);
-
-    if(texture == mTextureMap.end())
-    {
-        return NULL;
-    }
-    else
-    {
-        return texture->second;
-    }
-}
-
-Program *ResourceManager::getProgram(unsigned int handle)
-{
-    ProgramMap::iterator program = mProgramMap.find(handle);
-
-    if(program == mProgramMap.end())
-    {
-        return NULL;
-    }
-    else
-    {
-        return program->second;
-    }
-}
-
-Renderbuffer *ResourceManager::getRenderbuffer(unsigned int handle)
-{
-    RenderbufferMap::iterator renderbuffer = mRenderbufferMap.find(handle);
-
-    if(renderbuffer == mRenderbufferMap.end())
-    {
-        return NULL;
-    }
-    else
-    {
-		if (!renderbuffer->second)
-		{
-			Renderbuffer *renderbufferObject = new Renderbuffer(handle, new Colorbuffer(0, 0, GL_RGBA4_OES, 0));
-			mRenderbufferMap[handle] = renderbufferObject;
-			renderbufferObject->addRef();
-		}
-        return renderbuffer->second;
-    }
-}
-
-void ResourceManager::setRenderbuffer(GLuint handle, Renderbuffer *buffer)
-{
-    mRenderbufferMap[handle] = buffer;
-}
-
-void ResourceManager::checkTextureAllocation(GLuint texture, TextureType type)
-{
-    if(!getTexture(texture) && texture != 0)
-    {
-        Texture *textureObject;
-
-        if(type == TEXTURE_2D)
-        {
-            textureObject = new Texture2D(texture);
-        }
-        else if(type == TEXTURE_CUBE)
-        {
-            textureObject = new TextureCubeMap(texture);
-        }
-        else if(type == TEXTURE_EXTERNAL)
-        {
-            textureObject = new TextureExternal(texture);
-        }
-        else
-        {
-            UNREACHABLE();
-            return;
-        }
-
-        mTextureMap[texture] = textureObject;
-        textureObject->addRef();
-    }
-}
-
-}

src/Radiance/libRAD/ResourceManager.h

-// SwiftShader Software Renderer
-//
-// Copyright(c) 2005-2012 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.
-//
-
-// ResourceManager.h : Defines the ResourceManager class, which tracks objects
-// shared by multiple GL contexts.
-
-#ifndef LIBGLESV2_RESOURCEMANAGER_H_
-#define LIBGLESV2_RESOURCEMANAGER_H_
-
-#include "HandleAllocator.h"
-
-#define GL_APICALL
-#include <GLES2/gl2.h>
-
-#include <map>
-
-namespace es2
-{
-class Shader;
-class Program;
-class Texture;
-class Renderbuffer;
-
-enum TextureType
-{
-    TEXTURE_2D,
-    TEXTURE_CUBE,
-    TEXTURE_EXTERNAL,
-
-    TEXTURE_TYPE_COUNT,
-    TEXTURE_UNKNOWN
-};
-
-class ResourceManager
-{
-  public:
-    ResourceManager();
-    ~ResourceManager();
-
-    void addRef();
-    void release();
-
-    GLuint createBuffer();
-    GLuint createShader(GLenum type);
-    GLuint createProgram();
-    GLuint createTexture();
-    GLuint createRenderbuffer();
-
-    void deleteShader(GLuint shader);
-    void deleteProgram(GLuint program);
-    void deleteTexture(GLuint texture);
-    void deleteRenderbuffer(GLuint renderbuffer);
-
-    Shader *getShader(GLuint handle);
-    Program *getProgram(GLuint handle);
-    Texture *getTexture(GLuint handle);
-    Renderbuffer *getRenderbuffer(GLuint handle);
-    
-    void setRenderbuffer(GLuint handle, Renderbuffer *renderbuffer);
-
-    void checkTextureAllocation(GLuint texture, TextureType type);
-
-  private:
-    std::size_t mRefCount;
-	
-    typedef std::map<GLint, Shader*> ShaderMap;
-    ShaderMap mShaderMap;
-
-    typedef std::map<GLint, Program*> ProgramMap;
-    ProgramMap mProgramMap;
-    HandleAllocator mProgramShaderHandleAllocator;
-
-    typedef std::map<GLint, Texture*> TextureMap;
-    TextureMap mTextureMap;
-    HandleAllocator mTextureHandleAllocator;
-
-    typedef std::map<GLint, Renderbuffer*> RenderbufferMap;
-    RenderbufferMap mRenderbufferMap;
-    HandleAllocator mRenderbufferHandleAllocator;
-};
-
-}
-
-#endif // LIBGLESV2_RESOURCEMANAGER_H_

src/Radiance/libRAD/Shader.cpp

@@ -26,7 +26,7 @@ namespace es2
 {
 bool Shader::compilerInitialized = false;
 
-Shader::Shader(ResourceManager *manager, GLuint handle) : mHandle(handle), mResourceManager(manager)
+Shader::Shader(GLuint handle) : mHandle(handle)
 {
     mSource = NULL;
     mInfoLog = NULL;
@@ -216,10 +216,10 @@ void Shader::release()
 {
     mRefCount--;
 
-    if(mRefCount == 0 && mDeleteStatus)
-    {
-        mResourceManager->deleteShader(mHandle);
-    }
+	if(mRefCount == 0)
+	{
+		delete this;
+	}
 }
 
 unsigned int Shader::getRefCount() const
@@ -361,7 +361,7 @@ bool Shader::compareVarying(const Varying &x, const Varying &y)
     return false;
 }
 
-VertexShader::VertexShader(ResourceManager *manager, GLuint handle) : Shader(manager, handle)
+VertexShader::VertexShader(GLuint handle) : Shader(handle)
 {
 	vertexShader = 0;
 }
@@ -447,7 +447,7 @@ sw::VertexShader *VertexShader::getVertexShader() const
 	return vertexShader;
 }
 
-FragmentShader::FragmentShader(ResourceManager *manager, GLuint handle) : Shader(manager, handle)
+FragmentShader::FragmentShader(GLuint handle) : Shader(handle)
 {
 	pixelShader = 0;
 }

src/Radiance/libRAD/Shader.h

@@ -17,8 +17,6 @@
 #ifndef LIBGLESV2_SHADER_H_
 #define LIBGLESV2_SHADER_H_
 
-#include "ResourceManager.h"
-
 #include "compiler/TranslatorASM.h"
 
 #define GL_APICALL
@@ -67,7 +65,7 @@ class Shader
 	friend class sh::OutputASM;
 
 public:
-    Shader(ResourceManager *manager, GLuint handle);
+    Shader(GLuint handle);
 
     virtual ~Shader();
 
@@ -115,8 +113,6 @@ private:
 	const GLuint mHandle;
     unsigned int mRefCount;     // Number of program objects this shader is attached to
     bool mDeleteStatus;         // Flag to indicate that the shader can be deleted when no longer in use
-
-	ResourceManager *mResourceManager;
 };
 
 class VertexShader : public Shader
@@ -124,7 +120,7 @@ class VertexShader : public Shader
     friend class Program;
 
 public:
-    VertexShader(ResourceManager *manager, GLuint handle);
+    VertexShader(GLuint handle);
 
     ~VertexShader();
 
@@ -142,7 +138,7 @@ private:
 class FragmentShader : public Shader
 {
 public:
-    FragmentShader(ResourceManager *manager, GLuint handle);
+    FragmentShader(GLuint handle);
 
     ~FragmentShader();
 

src/Radiance/libRAD/Texture.cpp

@@ -404,50 +404,6 @@ void Texture2D::setImage(GLint level, GLsizei width, GLsizei height, GLenum form
     Texture::setImage(format, type, unpackAlignment, pixels, image[level]);
 }
 
-void Texture2D::bindTexImage(egl::Surface *surface)
-{
-    GLenum format;
-
-    switch(surface->getInternalFormat())
-    {
-    case sw::FORMAT_A8R8G8B8:
-        format = GL_RGBA;
-        break;
-    case sw::FORMAT_X8R8G8B8:
-        format = GL_RGB;
-        break;
-    default:
-        UNIMPLEMENTED();
-        return;
-    }
-
-	for(int level = 0; level < MIPMAP_LEVELS; level++)
-	{
-		if(image[level])
-		{
-			image[level]->unbind();
-			image[level] = 0;
-		}
-	}
-
-	image[0] = surface->getRenderTarget();
-
-    mSurface = surface;
-    mSurface->setBoundTexture(this);
-}
-
-void Texture2D::releaseTexImage()
-{
-    for(int level = 0; level < MIPMAP_LEVELS; level++)
-	{
-		if(image[level])
-		{
-			image[level]->unbind();
-			image[level] = 0;
-		}
-	}
-}
-
 void Texture2D::setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei imageSize, const void *pixels)
 {
 	if(image[level])

src/Radiance/libRAD/Texture.h

@@ -139,8 +139,6 @@ public:
     virtual bool isSamplerComplete() const;
     virtual bool isCompressed(GLenum target, GLint level) const;
 	virtual bool isDepth(GLenum target, GLint level) const;
-    virtual void bindTexImage(egl::Surface *surface);
-    virtual void releaseTexImage();
 
     virtual void generateMipmaps();
 

src/Radiance/libRAD/VertexDataManager.cpp

@@ -33,7 +33,7 @@ VertexDataManager::~VertexDataManager()
 GLenum VertexDataManager::prepareVertexData(GLint start, GLsizei count, TranslatedAttribute *translated)
 {
     const VertexAttributeArray &attribs = mContext->getVertexAttributes();
-    Program *program = mContext->getCurrentProgram();
+    Program *program = mContext->mState.program;
     
     // Perform the vertex data translations
     for(int i = 0; i < MAX_VERTEX_ATTRIBS; i++)

src/Radiance/libRAD/libRAD.cpp

@@ -322,7 +322,8 @@ class Program : public Object
 public:
 	Program(Device *device) : Object(device)
 	{
-		program = new es2::Program(nullptr, 0);
+		program = new es2::Program(0);
+		program->addRef();
 	}
 
 	virtual ~Program()
@@ -829,6 +830,7 @@ public:
 		}
 
 		image->unlock();
+		image->release();
 	}
 
 	Buffer *buffer;
@@ -1391,8 +1393,10 @@ void RADAPIENTRY radProgramSource(RADprogram program, RADprogramFormat format, R
 	GLint vertexLength = strlen(vertexSource);
 	GLint fragmentLength = strlen(fragmentSource);
 
-	es2::VertexShader *vertexShader = new es2::VertexShader(nullptr, 0);
-	es2::FragmentShader *fragmentShader = new es2::FragmentShader(nullptr, 0);
+	es2::VertexShader *vertexShader = new es2::VertexShader(0);
+	vertexShader->addRef();
+	es2::FragmentShader *fragmentShader = new es2::FragmentShader(0);
+	fragmentShader->addRef();
 
 	vertexShader->setSource(1, &vertexSource, &vertexLength);
 	fragmentShader->setSource(1, &fragmentSource, &fragmentLength);
@@ -1572,7 +1576,9 @@ RADrenderTargetHandle RADAPIENTRY radGetTextureRenderTargetHandle(RADtexture tex
 	default:
 		UNREACHABLE();
 	}
-	return reinterpret_cast<RADrenderTargetHandle>(radTexture->texture->getRenderTarget(glTarget, level));
+	egl::Image *image = radTexture->texture->getRenderTarget(glTarget, level);
+	image->release();   // FIXME: Handles are weak pointers
+	return reinterpret_cast<RADrenderTargetHandle>(image);
 }
 
 RADsampler RADAPIENTRY radCreateSampler(RADdevice device)

src/Radiance/libRAD/libRAD.vcxproj

@@ -175,7 +175,6 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman
     <ClCompile Include="Query.cpp" />
     <ClCompile Include="RefCountObject.cpp" />
     <ClCompile Include="Renderbuffer.cpp" />
-    <ClCompile Include="ResourceManager.cpp" />
     <ClCompile Include="Shader.cpp" />
     <ClCompile Include="Texture.cpp" />
     <ClCompile Include="utilities.cpp" />
@@ -201,7 +200,6 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman
     <ClInclude Include="RefCountObject.h" />
     <ClInclude Include="Renderbuffer.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="ResourceManager.h" />
     <ClInclude Include="Shader.h" />
     <ClInclude Include="Texture.h" />
     <ClInclude Include="utilities.h" />

src/Radiance/libRAD/libRAD.vcxproj.filters

@@ -47,9 +47,6 @@
     <ClCompile Include="Renderbuffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ResourceManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Shader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -109,9 +106,6 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ResourceManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Shader.h">
       <Filter>Header Files</Filter>
     </ClInclude>