Backing out r417 and r418.
I will recommit these as two separate patches: one for ID invalidation and one for reference counting issue.
I will not recommit the FBO changes and since the GLES2 spec will soon make it undefined whether FBOs are in a shared namespace.
Review URL: http://codereview.appspot.com/2154045
git-svn-id: https://angleproject.googlecode.com/svn/trunk@422 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/ResourceManager.cpp b/src/libGLESv2/ResourceManager.cpp
index 5abd756..12a86c1 100644
--- a/src/libGLESv2/ResourceManager.cpp
+++ b/src/libGLESv2/ResourceManager.cpp
@@ -12,7 +12,6 @@
#include "libGLESv2/Buffer.h"
#include "libGLESv2/Program.h"
#include "libGLESv2/RenderBuffer.h"
-#include "libGLESv2/FrameBuffer.h"
#include "libGLESv2/Shader.h"
#include "libGLESv2/Texture.h"
@@ -147,32 +146,13 @@
return handle;
}
-// Returns an unused framebuffer name
-GLuint ResourceManager::createFramebuffer()
-{
- unsigned int handle = 1;
-
- while (mFramebufferMap.find(handle) != mFramebufferMap.end())
- {
- handle++;
- }
-
- mFramebufferMap[handle] = NULL;
-
- return handle;
-}
-
void ResourceManager::deleteBuffer(GLuint buffer)
{
BufferMap::iterator bufferObject = mBufferMap.find(buffer);
if (bufferObject != mBufferMap.end())
{
- if (bufferObject->second)
- {
- bufferObject->second->markAsDeleted();
- bufferObject->second->release();
- }
+ if (bufferObject->second) bufferObject->second->release();
mBufferMap.erase(bufferObject);
}
}
@@ -219,11 +199,7 @@
if (textureObject != mTextureMap.end())
{
- if (textureObject->second)
- {
- textureObject->second->markAsDeleted();
- textureObject->second->release();
- }
+ if (textureObject->second) textureObject->second->release();
mTextureMap.erase(textureObject);
}
}
@@ -234,30 +210,11 @@
if (renderbufferObject != mRenderbufferMap.end())
{
- if (renderbufferObject->second)
- {
- renderbufferObject->second->markAsDeleted();
- renderbufferObject->second->release();
- }
+ if (renderbufferObject->second) renderbufferObject->second->release();
mRenderbufferMap.erase(renderbufferObject);
}
}
-void ResourceManager::deleteFramebuffer(GLuint framebuffer)
-{
- FramebufferMap::iterator framebufferObject = mFramebufferMap.find(framebuffer);
-
- if (framebufferObject != mFramebufferMap.end())
- {
- if (framebufferObject->second)
- {
- framebufferObject->second->markAsDeleted();
- framebufferObject->second->release();
- }
- mFramebufferMap.erase(framebufferObject);
- }
-}
-
Buffer *ResourceManager::getBuffer(unsigned int handle)
{
BufferMap::iterator buffer = mBufferMap.find(handle);
@@ -330,20 +287,6 @@
}
}
-Framebuffer *ResourceManager::getFramebuffer(unsigned int handle)
-{
- FramebufferMap::iterator framebuffer = mFramebufferMap.find(handle);
-
- if (framebuffer == mFramebufferMap.end())
- {
- return NULL;
- }
- else
- {
- return framebuffer->second;
- }
-}
-
void ResourceManager::setRenderbuffer(GLuint handle, Renderbuffer *buffer)
{
mRenderbufferMap[handle] = buffer;
@@ -394,14 +337,4 @@
}
}
-void ResourceManager::checkFramebufferAllocation(GLuint framebuffer)
-{
- if (framebuffer != 0 && !getFramebuffer(framebuffer))
- {
- Framebuffer *framebufferObject = new Framebuffer(framebuffer);
- mFramebufferMap[framebuffer] = framebufferObject;
- framebufferObject->addRef();
- }
-}
-
}