From: Keith Packard <keithp@keithp.com>
To: mesa-dev@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: [PATCH 12/18] dri3: Rename DRI3_MAX_BACK to DRI3_NUM_BACK
Date: Fri, 13 Dec 2013 17:25:24 -0800 [thread overview]
Message-ID: <1386984330-26074-13-git-send-email-keithp@keithp.com> (raw)
In-Reply-To: <1386984330-26074-1-git-send-email-keithp@keithp.com>
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>
---
src/glx/dri3_glx.c | 4 ++--
src/glx/dri3_priv.h | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index ea20138..c26d6e5 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -1065,7 +1065,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];
@@ -1181,7 +1181,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 4c5579e..49a13ba 100644
--- 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;
--
1.8.4.4
next prev parent reply other threads:[~2013-12-14 1:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 1:25 [PATCH 00/18] dri3+gallium patch series Keith Packard
2013-12-14 1:25 ` [PATCH 01/18] Remove glBlendColor and glBlendEquations decls from glext.h Keith Packard
2013-12-14 2:28 ` [Mesa-dev] " Kenneth Graunke
2013-12-14 6:56 ` Keith Packard
2013-12-20 18:24 ` Ian Romanick
2013-12-14 1:25 ` [PATCH 02/18] dri/swrast: Passing dri_context * instead of gl_context* to driContextSetFlags Keith Packard
2013-12-14 1:25 ` [PATCH 03/18] Don't use libudev for glx/dri3 Keith Packard
2013-12-14 1:25 ` [PATCH 04/18] dri3: Switch to libxshmfence version 1.1 Keith Packard
2013-12-14 2:35 ` [Mesa-dev] " Kenneth Graunke
2013-12-14 7:00 ` Keith Packard
2013-12-14 1:25 ` [PATCH 05/18] dri3: Free resources when drawable is destroyed Keith Packard
2013-12-14 1:25 ` [PATCH 06/18] dri3: Clean up struct dri3_drawable Keith Packard
2013-12-14 1:25 ` [PATCH 07/18] dri3: Track full 64-bit SBC numbers, instead of just 32-bits Keith Packard
2013-12-14 1:25 ` [PATCH 08/18] dri3: Fix dri3_wait_for_sbc to wait for completion of requested SBC Keith Packard
2013-12-14 1:25 ` [PATCH 09/18] dri3: Enable GLX_INTEL_swap_event Keith Packard
2013-12-14 1:25 ` [PATCH 10/18] i965: Correct check for re-bound buffer in intel_update_image_buffer Keith Packard
2013-12-14 1:25 ` [PATCH 11/18] i965: Set fast color clear mcs_state on newly allocated image miptrees Keith Packard
2013-12-14 1:25 ` Keith Packard [this message]
2013-12-14 1:25 ` [PATCH 13/18] dri3: Flush XCB before blocking for special events Keith Packard
2013-12-14 1:25 ` [PATCH 14/18] dri3, i915, i965: Add __DRI_IMAGE_FOURCC_SARGB8888 Keith Packard
2013-12-14 1:25 ` [PATCH 15/18] gallium: Add __DRIimageDriverExtension support to gallium Keith Packard
2013-12-14 11:27 ` Marek Olšák
2013-12-27 20:27 ` Keith Packard
2014-01-03 20:03 ` Marek Olšák
2013-12-14 1:25 ` [PATCH 16/18] gallium/dri: fix unsetting of format when encountering depth/stencil Keith Packard
2013-12-14 1:25 ` [PATCH 17/18] nvc0: fix segfault if nv50_miptree_from_handle() fails Keith Packard
2013-12-14 1:25 ` [PATCH 18/18] gallium: Use base.stamp for all drawable invalidation checks Keith Packard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386984330-26074-13-git-send-email-keithp@keithp.com \
--to=keithp@keithp.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=mesa-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).