Re: [Mesa-dev] [PATCH 3/3] mesa: s/GLint/gl_buffer_index/ for _ColorDrawBufferIndexes

[Charmaine Lee]

For this series, Reviewed-by: Charmaine Lee 


From: Brian Paul 
Sent: Thursday, November 9, 2017 11:31:42 AM
To: mesa-dev@lists.freedesktop.org
Cc: Charmaine Lee
Subject: [PATCH 3/3] mesa: s/GLint/gl_buffer_index/ for _ColorDrawBufferIndexes

Also fix local variable declarations and replace -1 with BUFFER_NONE.
No Piglit changes.
---
 src/mesa/drivers/common/meta.c   |  2 +-
 src/mesa/main/buffers.c  | 16 
 src/mesa/main/clear.c|  9 +
 src/mesa/main/framebuffer.c  |  4 ++--
 src/mesa/main/mtypes.h   |  2 +-
 src/mesa/state_tracker/st_cb_clear.c |  4 ++--
 src/mesa/state_tracker/st_cb_fbo.c   |  4 ++--
 src/mesa/swrast/s_blit.c |  8 
 src/mesa/swrast/s_renderbuffer.c |  4 ++--
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index bae04be..1cc736c 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1655,7 +1655,7 @@ _mesa_meta_drawbuffers_and_colormask(struct gl_context 
*ctx, GLbitfield mask)
enums[0] = GL_NONE;

for (int i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-  int b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
+  gl_buffer_index b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
   int colormask_idx = ctx->Extensions.EXT_draw_buffers2 ? i : 0;

   if (b < 0 || !(mask & (1 << b)) || is_color_disabled(ctx, colormask_idx))
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 5c37f0f..d364047 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -170,7 +170,7 @@ draw_buffer_enum_to_bitmask(const struct gl_context *ctx, 
GLenum buffer)
  * Helper routine used by glReadBuffer.
  * Given a GLenum naming a color buffer, return the index of the corresponding
  * renderbuffer (a BUFFER_* value).
- * return -1 for an invalid buffer.
+ * return BUFFER_NONE for an invalid buffer.
  */
 static gl_buffer_index
 read_buffer_enum_to_index(const struct gl_context *ctx, GLenum buffer)
@@ -719,7 +719,7 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
if (n > 0 && _mesa_bitcount(destMask[0]) > 1) {
   GLuint count = 0, destMask0 = destMask[0];
   while (destMask0) {
- const int bufIndex = u_bit_scan();
+ const gl_buffer_index bufIndex = u_bit_scan();
  if (fb->_ColorDrawBufferIndexes[count] != bufIndex) {
 updated_drawbuffers(ctx, fb);
 fb->_ColorDrawBufferIndexes[count] = bufIndex;
@@ -733,7 +733,7 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
   GLuint count = 0;
   for (buf = 0; buf < n; buf++ ) {
  if (destMask[buf]) {
-GLint bufIndex = ffs(destMask[buf]) - 1;
+gl_buffer_index bufIndex = ffs(destMask[buf]) - 1;
 /* only one bit should be set in the destMask[buf] field */
 assert(_mesa_bitcount(destMask[buf]) == 1);
 if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) {
@@ -743,9 +743,9 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
 count = buf + 1;
  }
  else {
-if (fb->_ColorDrawBufferIndexes[buf] != -1) {
+if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) {
   updated_drawbuffers(ctx, fb);
-   fb->_ColorDrawBufferIndexes[buf] = -1;
+   fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE;
 }
  }
  fb->ColorDrawBuffer[buf] = buffers[buf];
@@ -753,11 +753,11 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
   fb->_NumColorDrawBuffers = count;
}

-   /* set remaining outputs to -1 (GL_NONE) */
+   /* set remaining outputs to BUFFER_NONE */
for (buf = fb->_NumColorDrawBuffers; buf < ctx->Const.MaxDrawBuffers; 
buf++) {
-  if (fb->_ColorDrawBufferIndexes[buf] != -1) {
+  if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) {
  updated_drawbuffers(ctx, fb);
- fb->_ColorDrawBufferIndexes[buf] = -1;
+ fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE;
   }
}
for (buf = n; buf < ctx->Const.MaxDrawBuffers; buf++) {
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index c5e7f13..be60442 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -194,9 +194,9 @@ clear(struct gl_context *ctx, GLbitfield mask, bool 
no_error)
   if (mask & GL_COLOR_BUFFER_BIT) {
  GLuint i;
  for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-GLint buf = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
+gl_buffer_index buf = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];

-if (buf >= 0 && color_buffer_writes_enabled(ctx, i)) {
+if (buf != BUFFER_NONE && color_buffer_writes_enabled(ctx, i)) {

[Mesa-dev] [PATCH 3/3] mesa: s/GLint/gl_buffer_index/ for _ColorDrawBufferIndexes

[Brian Paul]

Also fix local variable declarations and replace -1 with BUFFER_NONE.
No Piglit changes.
---
 src/mesa/drivers/common/meta.c   |  2 +-
 src/mesa/main/buffers.c  | 16 
 src/mesa/main/clear.c|  9 +
 src/mesa/main/framebuffer.c  |  4 ++--
 src/mesa/main/mtypes.h   |  2 +-
 src/mesa/state_tracker/st_cb_clear.c |  4 ++--
 src/mesa/state_tracker/st_cb_fbo.c   |  4 ++--
 src/mesa/swrast/s_blit.c |  8 
 src/mesa/swrast/s_renderbuffer.c |  4 ++--
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index bae04be..1cc736c 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1655,7 +1655,7 @@ _mesa_meta_drawbuffers_and_colormask(struct gl_context 
*ctx, GLbitfield mask)
enums[0] = GL_NONE;
 
for (int i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-  int b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
+  gl_buffer_index b = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
   int colormask_idx = ctx->Extensions.EXT_draw_buffers2 ? i : 0;
 
   if (b < 0 || !(mask & (1 << b)) || is_color_disabled(ctx, colormask_idx))
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 5c37f0f..d364047 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -170,7 +170,7 @@ draw_buffer_enum_to_bitmask(const struct gl_context *ctx, 
GLenum buffer)
  * Helper routine used by glReadBuffer.
  * Given a GLenum naming a color buffer, return the index of the corresponding
  * renderbuffer (a BUFFER_* value).
- * return -1 for an invalid buffer.
+ * return BUFFER_NONE for an invalid buffer.
  */
 static gl_buffer_index
 read_buffer_enum_to_index(const struct gl_context *ctx, GLenum buffer)
@@ -719,7 +719,7 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
if (n > 0 && _mesa_bitcount(destMask[0]) > 1) {
   GLuint count = 0, destMask0 = destMask[0];
   while (destMask0) {
- const int bufIndex = u_bit_scan();
+ const gl_buffer_index bufIndex = u_bit_scan();
  if (fb->_ColorDrawBufferIndexes[count] != bufIndex) {
 updated_drawbuffers(ctx, fb);
 fb->_ColorDrawBufferIndexes[count] = bufIndex;
@@ -733,7 +733,7 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
   GLuint count = 0;
   for (buf = 0; buf < n; buf++ ) {
  if (destMask[buf]) {
-GLint bufIndex = ffs(destMask[buf]) - 1;
+gl_buffer_index bufIndex = ffs(destMask[buf]) - 1;
 /* only one bit should be set in the destMask[buf] field */
 assert(_mesa_bitcount(destMask[buf]) == 1);
 if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) {
@@ -743,9 +743,9 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
 count = buf + 1;
  }
  else {
-if (fb->_ColorDrawBufferIndexes[buf] != -1) {
+if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) {
   updated_drawbuffers(ctx, fb);
-   fb->_ColorDrawBufferIndexes[buf] = -1;
+   fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE;
 }
  }
  fb->ColorDrawBuffer[buf] = buffers[buf];
@@ -753,11 +753,11 @@ _mesa_drawbuffers(struct gl_context *ctx, struct 
gl_framebuffer *fb,
   fb->_NumColorDrawBuffers = count;
}
 
-   /* set remaining outputs to -1 (GL_NONE) */
+   /* set remaining outputs to BUFFER_NONE */
for (buf = fb->_NumColorDrawBuffers; buf < ctx->Const.MaxDrawBuffers; 
buf++) {
-  if (fb->_ColorDrawBufferIndexes[buf] != -1) {
+  if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) {
  updated_drawbuffers(ctx, fb);
- fb->_ColorDrawBufferIndexes[buf] = -1;
+ fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE;
   }
}
for (buf = n; buf < ctx->Const.MaxDrawBuffers; buf++) {
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index c5e7f13..be60442 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -194,9 +194,9 @@ clear(struct gl_context *ctx, GLbitfield mask, bool 
no_error)
   if (mask & GL_COLOR_BUFFER_BIT) {
  GLuint i;
  for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers; i++) {
-GLint buf = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
+gl_buffer_index buf = ctx->DrawBuffer->_ColorDrawBufferIndexes[i];
 
-if (buf >= 0 && color_buffer_writes_enabled(ctx, i)) {
+if (buf != BUFFER_NONE && color_buffer_writes_enabled(ctx, i)) {
bufferMask |= 1 << buf;
 }
  }
@@ -321,9 +321,10 @@ make_color_buffer_mask(struct gl_context *ctx, GLint 
drawbuffer)
   break;
default:
   {
- GLint buf = ctx->DrawBuffer->_ColorDrawBufferIndexes[drawbuffer];
+ gl_buffer_index buf =
+