Mesa (master): mesa: Make _mesa_initialize_visual return void

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fa425511ed7cc3ab5b15d42298bef688d4819ad2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa425511ed7cc3ab5b15d42298bef688d4819ad2

Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 22 18:21:12 2021 -0400

mesa: Make _mesa_initialize_visual return void

The assertions here clearly never get hit, and if they did it'd mean we
were _trying_ to enable 64-bit Z or something. And checking only that
the accumulation has non-negative size is... curious. Just delete it and
clean up the callers.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10045>

---

 src/mesa/drivers/x11/xm_api.c | 22 +++++++++-------------
 src/mesa/main/context.c       | 29 ++++++-----------------------
 src/mesa/main/context.h       |  2 +-
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 8d41690e9f7..a7983a413a6 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -847,19 +847,15 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
       alpha_bits = v->mesa_visual.alphaBits;
    }
 
-   if (!_mesa_initialize_visual(&v->mesa_visual,
-                                db_flag, stereo_flag,
-                                red_bits, green_bits,
-                                blue_bits, alpha_bits,
-                                depth_size,
-                                stencil_size,
-                                accum_red_size, accum_green_size,
-                                accum_blue_size, accum_alpha_size,
-                                0)) {
-      free(v->visinfo);
-      free(v);
-      return NULL;
-   }
+   _mesa_initialize_visual(&v->mesa_visual,
+                           db_flag, stereo_flag,
+                           red_bits, green_bits,
+                           blue_bits, alpha_bits,
+                           depth_size,
+                           stencil_size,
+                           accum_red_size, accum_green_size,
+                           accum_blue_size, accum_alpha_size,
+                           0);
 
    /* XXX minor hack */
    v->mesa_visual.level = level;
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 1189e50810d..4a8e76e0ce1 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -235,15 +235,11 @@ _mesa_create_visual( GLboolean dbFlag,
 {
    struct gl_config *vis = CALLOC_STRUCT(gl_config);
    if (vis) {
-      if (!_mesa_initialize_visual(vis, dbFlag, stereoFlag,
-                                   redBits, greenBits, blueBits, alphaBits,
-                                   depthBits, stencilBits,
-                                   accumRedBits, accumGreenBits,
-                                   accumBlueBits, accumAlphaBits,
-                                   numSamples)) {
-         free(vis);
-         return NULL;
-      }
+      _mesa_initialize_visual(vis, dbFlag, stereoFlag,
+                              redBits, greenBits, blueBits, alphaBits,
+                              depthBits, stencilBits,
+                              accumRedBits, accumGreenBits, accumBlueBits,
+                              accumAlphaBits, numSamples);
    }
    return vis;
 }
@@ -259,7 +255,7 @@ _mesa_create_visual( GLboolean dbFlag,
  *
  * \sa _mesa_create_visual() above for the parameter description.
  */
-GLboolean
+void
 _mesa_initialize_visual( struct gl_config *vis,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,
@@ -277,17 +273,6 @@ _mesa_initialize_visual( struct gl_config *vis,
 {
    assert(vis);
 
-   if (depthBits < 0 || depthBits > 32) {
-      return GL_FALSE;
-   }
-   if (stencilBits < 0 || stencilBits > 8) {
-      return GL_FALSE;
-   }
-   assert(accumRedBits >= 0);
-   assert(accumGreenBits >= 0);
-   assert(accumBlueBits >= 0);
-   assert(accumAlphaBits >= 0);
-
    vis->doubleBufferMode = dbFlag;
    vis->stereoMode       = stereoFlag;
 
@@ -306,8 +291,6 @@ _mesa_initialize_visual( struct gl_config *vis,
    vis->accumAlphaBits = accumAlphaBits;
 
    vis->samples = numSamples;
-
-   return GL_TRUE;
 }
 
 
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index f62a9a3f7b7..f8e59b421c9 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -82,7 +82,7 @@ _mesa_create_visual( GLboolean dbFlag,
                      GLint accumAlphaBits,
                      GLuint numSamples );
 
-extern GLboolean
+extern void
 _mesa_initialize_visual( struct gl_config *v,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,