dri3: Rename DRI3_MAX_BACK to DRI3_NUM_BACK

It is the maximum number of back buffers, but the name is confusing and is
easily read as the maximum back buffer index. Chage to DRI3_NUM_BACK to make
the intended usage a bit clearer.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 4c0dc29fdf847489bbe2b6ab3e7a06beaf5a9963..4aae182199ca7406dd3e93cd75e7c3f576e57b61 100644 (file)
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1034,7 +1034,7 @@ dri3_find_back(xcb_connection_t *c, struct dri3_drawable *priv)
 
    for (;;) {
 
-      for (b = 0; b < DRI3_MAX_BACK; b++) {
+      for (b = 0; b < DRI3_NUM_BACK; b++) {
          int                    id = DRI3_BACK_ID(b);
          struct dri3_buffer        *buffer = priv->buffers[id];
 
@@ -1150,7 +1150,7 @@ dri3_free_buffers(__DRIdrawable *driDrawable,
    switch (buffer_type) {
    case dri3_buffer_back:
       first_id = DRI3_BACK_ID(0);
-      n_id = DRI3_MAX_BACK;
+      n_id = DRI3_NUM_BACK;
       break;
    case dri3_buffer_front:
       first_id = DRI3_FRONT_ID;

diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index f33a719ac68e8bee02254b06bd7231a3cf2faf81..3f289b9832ab00922d7765ccdac3322e2d379c30 100644 (file)
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -143,14 +143,14 @@ struct dri3_context
    __DRIcontext *driContext;
 };
 
-#define DRI3_MAX_BACK   2
+#define DRI3_NUM_BACK   2
 #define DRI3_BACK_ID(i) (i)
-#define DRI3_FRONT_ID   (DRI3_MAX_BACK)
+#define DRI3_FRONT_ID   (DRI3_NUM_BACK)
 
 static inline int
 dri3_buf_id_next(int buf_id)
 {
-   if (buf_id == DRI3_MAX_BACK - 1)
+   if (buf_id == DRI3_NUM_BACK - 1)
       return 0;
    return buf_id + 1;
 }
@@ -159,7 +159,7 @@ static inline int
 dri3_buf_id_prev(int buf_id)
 {
    if (buf_id == 0)
-      return DRI3_MAX_BACK - 1;
+      return DRI3_NUM_BACK - 1;
    return buf_id - 1;
 }
 
@@ -172,7 +172,7 @@ dri3_pixmap_buf_id(enum dri3_buffer_type buffer_type)
       return DRI3_FRONT_ID;
 }
 
-#define DRI3_NUM_BUFFERS        (1 + DRI3_MAX_BACK)
+#define DRI3_NUM_BUFFERS        (1 + DRI3_NUM_BACK)
 
 struct dri3_drawable {
    __GLXDRIdrawable base;