Tweaks to the sample/depth patch.

- Adjust formatting of some preprocessor commands
- Mark the API as unstable and added since 5.2.1
- Move the documentation around a bit

Author: SiegeLordEx

docs/src/refman/graphics.txt

@@ -680,17 +680,20 @@ thread) if they are used with [al_set_target_bitmap]. 0 means no
 depth-buffer will be created when drawing into the bitmap, which is the
 default.
 
-> *Note:* This is an experimental feature and currently only works for
-the OpenGL backend.
+Since: 5.2.1
 
-Since: 5.1.14
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
 
 ### API: al_get_new_bitmap_depth
 
 Returns the value currently set with [al_set_new_bitmap_depth] on
 the current thread or 0 if none was set.
 
-Since: 5.1.14
+Since: 5.2.1
+
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
 
 ### API: al_set_new_bitmap_samples
 
@@ -701,9 +704,6 @@ the default. 1 means multi-sampling will be used but only using a single
 sample per pixel (so usually there will be no visual difference to not
 using multi-sampling at all).
 
-> *Note:* This is an experimental feature and currently only works for
-the OpenGL backend.
-
 > *Note:* Some platforms have restrictions on when the multi-sampling
 buffer for a bitmap is realized, i.e. down-scaled back to the actual
 bitmap dimensions. This may only happen after a call to
@@ -720,14 +720,20 @@ bitmap dimensions. This may only happen after a call to
     // CORRECT: at this point, the bitmap contents are updated and
     // there will be an anti-aliased line in it.
 
-Since: 5.1.14
+Since: 5.2.1
+
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
 
 ### API: al_get_new_bitmap_samples
 
 Returns the value currently set with [al_set_new_bitmap_samples] on
 the current thread or 0 if none was set.
 
-Since: 5.1.14
+Since: 5.2.1
+
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
 
 ## Bitmap properties
 
@@ -751,6 +757,26 @@ Returns the height of a bitmap in pixels.
 
 Returns the width of a bitmap in pixels.
 
+### API: al_get_bitmap_depth
+
+Return the depthbuffer depth used by this bitmap if it is used with
+[al_set_target_bitmap].
+
+Since: 5.2.1
+
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
+
+### API: al_get_bitmap_samples
+
+Return the multi-sampling samples used by this bitmap if it is used with
+[al_set_target_bitmap].
+
+Since: 5.2.1
+
+> *[Unstable API]:* This is an experimental feature and currently only works for
+the OpenGL backend.
+
 ### API: al_get_pixel
 
 Get a pixel's color value from the specified bitmap.  This operation is slow
@@ -1184,20 +1210,6 @@ associated texture.
 
 See also: [al_get_target_bitmap], [al_set_target_backbuffer]
 
-### API: al_get_bitmap_depth
-
-Return the depthbuffer depth used by this bitmap if it is used with
-[al_set_target_bitmap].
-
-Since: 5.1.14
-
-### API: al_get_bitmap_samples
-
-Return the multi-sampling samples used by this bitmap if it is used with
-[al_set_target_bitmap].
-
-Since: 5.1.14
-
 ### API: al_set_target_backbuffer
 
 Same as `al_set_target_bitmap(al_get_backbuffer(display));`

examples/ex_depth_target.c

@@ -1,3 +1,4 @@
+#define ALLEGRO_UNSTABLE
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_image.h>
 #include <allegro5/allegro_font.h>

examples/ex_multisample_target.c

@@ -1,3 +1,4 @@
+#define ALLEGRO_UNSTABLE
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_image.h>
 #include <allegro5/allegro_font.h>

include/allegro5/bitmap.h

@@ -36,17 +36,23 @@ AL_FUNC(void, al_set_new_bitmap_flags, (int flags));
 AL_FUNC(int, al_get_new_bitmap_format, (void));
 AL_FUNC(int, al_get_new_bitmap_flags, (void));
 AL_FUNC(void, al_add_new_bitmap_flag, (int flag));
+
+#if defined(ALLEGRO_UNSTABLE) || defined(ALLEGRO_INTERNAL_UNSTABLE) || defined(ALLEGRO_SRC)
 AL_FUNC(int, al_get_new_bitmap_depth, (void));
 AL_FUNC(void, al_set_new_bitmap_depth, (int depth));
 AL_FUNC(int, al_get_new_bitmap_samples, (void));
 AL_FUNC(void, al_set_new_bitmap_samples, (int samples));
+#endif
 
 AL_FUNC(int, al_get_bitmap_width, (ALLEGRO_BITMAP *bitmap));
 AL_FUNC(int, al_get_bitmap_height, (ALLEGRO_BITMAP *bitmap));
 AL_FUNC(int, al_get_bitmap_format, (ALLEGRO_BITMAP *bitmap));
 AL_FUNC(int, al_get_bitmap_flags, (ALLEGRO_BITMAP *bitmap));
+
+#if defined(ALLEGRO_UNSTABLE) || defined(ALLEGRO_INTERNAL_UNSTABLE) || defined(ALLEGRO_SRC)
 AL_FUNC(int, al_get_bitmap_depth, (ALLEGRO_BITMAP *bitmap));
 AL_FUNC(int, al_get_bitmap_samples, (ALLEGRO_BITMAP *bitmap));
+#endif
 
 AL_FUNC(ALLEGRO_BITMAP*, al_create_bitmap, (int w, int h));
 AL_FUNC(void, al_destroy_bitmap, (ALLEGRO_BITMAP *bitmap));

src/opengl/ogl_fbo.c

@@ -177,11 +177,11 @@ static void attach_depth_buffer(ALLEGRO_FBO_INFO *info)
       int samples = al_get_bitmap_samples(info->owner);
 
       bool extension_supported;
-      #ifdef ALLEGRO_CFG_OPENGLES
-         extension_supported = display->ogl_extras->extension_list->ALLEGRO_GL_EXT_multisampled_render_to_texture;
-      #else
-         extension_supported = display->ogl_extras->extension_list->ALLEGRO_GL_EXT_framebuffer_multisample;
-      #endif
+#ifdef ALLEGRO_CFG_OPENGLES
+      extension_supported = display->ogl_extras->extension_list->ALLEGRO_GL_EXT_multisampled_render_to_texture;
+#else
+      extension_supported = display->ogl_extras->extension_list->ALLEGRO_GL_EXT_framebuffer_multisample;
+#endif
 
       if (samples == 0 || !extension_supported)
          glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, gldepth, w, h);
@@ -234,9 +234,9 @@ static void attach_multisample_buffer(ALLEGRO_FBO_INFO *info)
    if (!display->ogl_extras->extension_list->ALLEGRO_GL_EXT_framebuffer_multisample)
       return;
 
-   #ifdef ALLEGRO_CFG_OPENGLES
-      (void)display;
-   #else
+#ifdef ALLEGRO_CFG_OPENGLES
+   (void)display;
+#else
 
    if (info->buffers.multisample_buffer == 0) {
       GLuint rb;
@@ -595,7 +595,7 @@ static void use_fbo_for_bitmap(ALLEGRO_DISPLAY *display,
    if (!info->buffers.multisample_buffer) {
 
       /* Attach the texture. */
-      #ifdef ALLEGRO_CFG_OPENGLES
+#ifdef ALLEGRO_CFG_OPENGLES
       if (ANDROID_PROGRAMMABLE_PIPELINE(al_get_current_display())) {
          bool extension_supported = display->ogl_extras->
             extension_list->
@@ -614,7 +614,7 @@ static void use_fbo_for_bitmap(ALLEGRO_DISPLAY *display,
 #endif
       }
       else
-      #endif
+#endif
       {
          glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
             GL_TEXTURE_2D, ogl_bitmap->texture, 0);