check for framebuffer completeness, code clean-up

[mesa.git] / src / mesa / main / fbobject.h

diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 222c58d00a2476278cafbc391cd537f6a6ee69df..2c86ef93726bd751553a0ebcd7454b9c020ed108 100644 (file)
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -27,95 +27,87 @@
 #define FBOBJECT_H
 
 
-struct gl_render_buffer_object
-{
-   GLint RefCount;
-   GLuint Name;
-   GLuint Width, Height;
-};
-
-
-struct gl_render_buffer_attachment
-{
-   GLenum Type;  /* GL_NONE or GL_TEXTURE or GL_RENDERBUFFER_EXT */
-   /* IF Type == GL_RENDERBUFFER_EXT: */
-   struct gl_render_buffer_object *Renderbuffer;
-   /* IF Type == GL_TEXTURE: */
-   struct gl_texture_object *Texture;
-   GLuint TextureLevel;
-   GLuint CubeMapFace;  /* 0 .. 5, for Cube map textures */
-   GLuint Zoffset;      /* for 3D textures */
-};
-
-
-struct gl_frame_buffer_object
-{
-   GLint RefCount;
-   GLuint Name;
-
-   struct gl_render_buffer_attachment ColorAttachment[MAX_COLOR_ATTACHMENTS];
-   struct gl_render_buffer_attachment DepthAttachment;
-   struct gl_render_buffer_attachment StencilAttachment;
-};
-
-
-extern GLboolean
-_mesa_IsRenderbufferEXT(GLuint renderbuffer);
+extern void
+_mesa_remove_attachment(GLcontext *ctx,
+                        struct gl_renderbuffer_attachment *att);
 
 extern void
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
+_mesa_set_texture_attachment(GLcontext *ctx,
+                             struct gl_renderbuffer_attachment *att,
+                             struct gl_texture_object *texObj,
+                             GLenum texTarget, GLuint level, GLuint zoffset);
 
 extern void
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
+_mesa_set_renderbuffer_attachment(GLcontext *ctx,
+                                  struct gl_renderbuffer_attachment *att,
+                                  struct gl_renderbuffer *rb);
 
 extern void
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
+_mesa_framebuffer_renderbuffer(GLcontext *ctx,
+                               struct gl_renderbuffer_attachment *att,
+                               struct gl_renderbuffer *rb);
 
 extern void
+_mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsRenderbufferEXT(GLuint renderbuffer);
+
+extern void GLAPIENTRY
+_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
+
+extern void GLAPIENTRY
+_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
+
+extern void GLAPIENTRY
+_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
+
+extern void GLAPIENTRY
 _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
 
-extern void
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params);
+extern void GLAPIENTRY
+_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
+                                    GLint *params);
 
-extern GLboolean
+extern GLboolean GLAPIENTRY
 _mesa_IsFramebufferEXT(GLuint framebuffer);
 
-extern void
+extern void GLAPIENTRY
 _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
 
-extern void
+extern void GLAPIENTRY
 _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
 
-extern GLenum
+extern GLenum GLAPIENTRY
 _mesa_CheckFramebufferStatusEXT(GLenum target);
 
-extern void
+extern void GLAPIENTRY
 _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level);
 
-extern void
+extern void GLAPIENTRY
 _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture, GLint level);
 
-extern void
+extern void GLAPIENTRY
 _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
                               GLenum textarget, GLuint texture,
                               GLint level, GLint zoffset);
 
-extern void
+extern void GLAPIENTRY
 _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
                                  GLenum renderbuffertarget,
                                  GLuint renderbuffer);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
                                              GLenum pname, GLint *params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GenerateMipmapEXT(GLenum target);