remove ^M chars, disable shading language extensions

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

diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 8b5fd5d1fc2617d3f0a2b9af5c93558f35a6965c..2c86ef93726bd751553a0ebcd7454b9c020ed108 100644 (file)
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -27,39 +27,28 @@
 #define FBOBJECT_H
 
 
-struct gl_render_buffer_object
-{
-   GLint RefCount;
-   GLuint Name;
-   GLuint Width, Height;
-   GLenum InternalFormat;
-   GLvoid *Data;
-};
-
-
-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 void
+_mesa_remove_attachment(GLcontext *ctx,
+                        struct gl_renderbuffer_attachment *att);
 
+extern void
+_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_set_renderbuffer_attachment(GLcontext *ctx,
+                                  struct gl_renderbuffer_attachment *att,
+                                  struct gl_renderbuffer *rb);
+
+extern void
+_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);
@@ -78,7 +67,8 @@ _mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
                              GLsizei width, GLsizei height);
 
 extern void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params);
+_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
+                                    GLint *params);
 
 extern GLboolean GLAPIENTRY
 _mesa_IsFramebufferEXT(GLuint framebuffer);