Rename st_framebuffer_attachment to st_attachment_type.

Follow the naming of other enums.  Fix typo in
ST_ATTACHMENT_DEPTH_STENCIL_MASK.

1 files changed, 18 insertions, 18 deletions

diff --git a/st_api.h b/st_api.h
index da89c87..ec4267f 100644
--- a/st_api.h
+++ b/st_api.h
@@ -73,24 +73,24 @@ enum st_texture_type {
 /**
  * Available attachments of framebuffer.
  */
-enum st_framebuffer_attachment {
-   ST_FRAMEBUFFER_FRONT_LEFT,
-   ST_FRAMEBUFFER_BACK_LEFT,
-   ST_FRAMEBUFFER_FRONT_RIGHT,
-   ST_FRAMEBUFFER_BACK_RIGHT,
-   ST_FRAMEBUFFER_DEPTH_STENCIL,
-   ST_FRAMEBUFFER_ACCUM,
-   ST_FRAMEBUFFER_SAMPLE,
+enum st_attachment_type {
+   ST_ATTACHMENT_FRONT_LEFT,
+   ST_ATTACHMENT_BACK_LEFT,
+   ST_ATTACHMENT_FRONT_RIGHT,
+   ST_ATTACHMENT_BACK_RIGHT,
+   ST_ATTACHMENT_DEPTH_STENCIL,
+   ST_ATTACHMENT_ACCUM,
+   ST_ATTACHMENT_SAMPLE,
 };
 
 /* for buffer_mask in st_visual */
-#define ST_FRAMEBUFFER_FRONT_LEFT_MASK  (1 << ST_FRAMEBUFFER_FRONT_LEFT)
-#define ST_FRAMEBUFFER_BACK_LEFT_MASK   (1 << ST_FRAMEBUFFER_BACK_LEFT)
-#define ST_FRAMEBUFFER_FRONT_RIGHT_MASK (1 << ST_FRAMEBUFFER_FRONT_RIGHT)
-#define ST_FRAMEBUFFER_BACK_RIGHT_MASK  (1 << ST_FRAMEBUFFER_BACK_RIGHT)
-#define ST_FRAMEBUFFER_DEPTH_STENCIL    (1 << ST_FRAMEBUFFER_DEPTH_STENCIL)
-#define ST_FRAMEBUFFER_ACCUM_MASK       (1 << ST_FRAMEBUFFER_ACCUM)
-#define ST_FRAMEBUFFER_SAMPLE_MASK      (1 << ST_FRAMEBUFFER_SAMPLE)
+#define ST_ATTACHMENT_FRONT_LEFT_MASK 	  (1 << ST_ATTACHMENT_FRONT_LEFT)
+#define ST_ATTACHMENT_BACK_LEFT_MASK  	  (1 << ST_ATTACHMENT_BACK_LEFT)
+#define ST_ATTACHMENT_FRONT_RIGHT_MASK	  (1 << ST_ATTACHMENT_FRONT_RIGHT)
+#define ST_ATTACHMENT_BACK_RIGHT_MASK 	  (1 << ST_ATTACHMENT_BACK_RIGHT)
+#define ST_ATTACHMENT_DEPTH_STENCIL_MASK  (1 << ST_ATTACHMENT_DEPTH_STENCIL)
+#define ST_ATTACHMENT_ACCUM_MASK      	  (1 << ST_ATTACHMENT_ACCUM)
+#define ST_ATTACHMENT_SAMPLE_MASK     	  (1 << ST_ATTACHMENT_SAMPLE)
 
 /**
  * Enumerations of state tracker manager resources.
@@ -148,7 +148,7 @@ struct st_visual
    /**
     * Desired render buffer.
     */
-   enum st_framebuffer_attachment render_buffer;
+   enum st_attachment_type render_buffer;
 };
 
 /**
@@ -191,7 +191,7 @@ struct st_framebuffer
     * @att is one of the front buffer attachments.
     */
    boolean (*flush_front)(struct st_framebuffer *stfb,
-                          enum st_framebuffer_attachment statt);
+                          enum st_attachment_type statt);
 
    /**
     * The state tracker asks for the textures it needs.
@@ -211,7 +211,7 @@ struct st_framebuffer
     * future.
     */
    boolean (*validate)(struct st_framebuffer *stfb,
-                       const enum st_framebuffer_attachment *statts,
+                       const enum st_attachment_type *statts,
                        unsigned count,
                        struct pipe_texture **out);
 };