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.h b/src/libGLESv2/ResourceManager.h
index 97f82b7..346e51f 100644
--- a/src/libGLESv2/ResourceManager.h
+++ b/src/libGLESv2/ResourceManager.h
@@ -24,7 +24,6 @@
class Program;
class Texture;
class Renderbuffer;
-class Framebuffer;
enum SamplerType
{
@@ -48,29 +47,25 @@
GLuint createProgram();
GLuint createTexture();
GLuint createRenderbuffer();
- GLuint createFramebuffer();
void deleteBuffer(GLuint buffer);
void deleteShader(GLuint shader);
void deleteProgram(GLuint program);
void deleteTexture(GLuint texture);
void deleteRenderbuffer(GLuint renderbuffer);
- void deleteFramebuffer(GLuint framebuffer);
Buffer *getBuffer(GLuint handle);
Shader *getShader(GLuint handle);
Program *getProgram(GLuint handle);
Texture *getTexture(GLuint handle);
Renderbuffer *getRenderbuffer(GLuint handle);
- Framebuffer *getFramebuffer(GLuint handle);
void setRenderbuffer(GLuint handle, Renderbuffer *renderbuffer);
void checkBufferAllocation(unsigned int buffer);
void checkTextureAllocation(GLuint texture, SamplerType type);
void checkRenderbufferAllocation(GLuint renderbuffer);
- void checkFramebufferAllocation(GLuint framebuffer);
-
+
private:
DISALLOW_COPY_AND_ASSIGN(ResourceManager);
@@ -90,9 +85,6 @@
typedef std::map<GLuint, Renderbuffer*> RenderbufferMap;
RenderbufferMap mRenderbufferMap;
-
- typedef std::map<GLuint, Framebuffer*> FramebufferMap;
- FramebufferMap mFramebufferMap;
};
}