Merge branch 'origin'

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

diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index 11b002877c97faf95f1af73e55c0758590cbabdc..7f3254fe8ea1227852d3ad422f234dba5d28a395 100644 (file)
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -36,15 +36,6 @@ _mesa_new_framebuffer(GLcontext *ctx, GLuint name);
 extern void
 _mesa_initialize_framebuffer(struct gl_framebuffer *fb, const GLvisual *visual);
 
-extern void
-_mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
-                             GLboolean color,
-                             GLboolean depth,
-                             GLboolean stencil,
-                             GLboolean accum,
-                             GLboolean alpha,
-                             GLboolean aux);
-
 extern void
 _mesa_destroy_framebuffer(struct gl_framebuffer *buffer);
 
@@ -52,7 +43,10 @@ extern void
 _mesa_free_framebuffer_data(struct gl_framebuffer *buffer);
 
 extern void
-_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *b,
+_mesa_dereference_framebuffer(struct gl_framebuffer **fb);
+
+extern void
+_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
                          GLuint width, GLuint height);
 
 extern void 
@@ -61,7 +55,22 @@ _mesa_update_draw_buffer_bounds(GLcontext *ctx);
 extern void
 _mesa_update_framebuffer_visual(struct gl_framebuffer *fb);
 
+extern void
+_mesa_update_depth_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
+                            GLuint attIndex);
+
+extern void
+_mesa_update_stencil_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
+                            GLuint attIndex);
+
 extern void
 _mesa_update_framebuffer(GLcontext *ctx);
 
+extern GLboolean
+_mesa_source_buffer_exists(GLcontext *ctx, GLenum format);
+
+extern GLboolean
+_mesa_dest_buffer_exists(GLcontext *ctx, GLenum format);
+
+
 #endif /* FRAMEBUFFER_H */