mesa: Remove redundant gl_config::sampleBuffers

This is just !!samples. Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9817>
maemo-leste-upstream-forks · Mar 30, 2021 · 4daef7f · 4daef7f
1 parent 4fbe1cb
commit 4daef7f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
@@ -425,7 +425,7 @@ dri_fill_st_visual(struct st_visual *stvis,
       return;
    }
 
-   if (mode->sampleBuffers) {
+   if (mode->samples > 0) {
       stvis->samples = mode->samples;
    }
 

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
@@ -359,7 +359,6 @@ driCreateConfigs(mesa_format format,
 		    }
 
 		    modes->samples = msaa_samples[h];
-		    modes->sampleBuffers = modes->samples ? 1 : 0;
 
 		    modes->sRGBCapable = is_srgb;
 		    modes->mutableRenderBuffer = mutable_render_buffer;
@@ -437,7 +436,9 @@ driGetConfigAttribIndex(const __DRIconfig *config,
     __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE,		accumGreenBits);
     __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE,		accumBlueBits);
     __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE,		accumAlphaBits);
-    __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS,		sampleBuffers);
+    case __DRI_ATTRIB_SAMPLE_BUFFERS:
+        *value = !!config->modes.samples;
+        break;
     __ATTRIB(__DRI_ATTRIB_SAMPLES,			samples);
     case __DRI_ATTRIB_RENDER_TYPE:
         /* no support for color index mode */

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
@@ -305,7 +305,6 @@ _mesa_initialize_visual( struct gl_config *vis,
    vis->accumBlueBits  = accumBlueBits;
    vis->accumAlphaBits = accumAlphaBits;
 
-   vis->sampleBuffers = numSamples > 0 ? 1 : 0;
    vis->samples = numSamples;
 
    return GL_TRUE;

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
@@ -450,7 +450,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
           * attachments).
           */
          fb->Visual.samples = rb->NumSamples;
-         fb->Visual.sampleBuffers = rb->NumSamples > 0 ? 1 : 0;
 
          if (_mesa_is_legal_color_format(ctx, baseFormat)) {
             fb->Visual.redBits = _mesa_get_format_bits(fmt, GL_RED_BITS);

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
@@ -171,7 +171,6 @@ struct gl_config
    GLint stencilBits;
 
    /* ARB_multisample / SGIS_multisample */
-   GLint sampleBuffers;
    GLuint samples;
 
    /* OML_swap_method */

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
@@ -424,7 +424,6 @@ st_visual_to_context_mode(const struct st_visual *visual,
    }
 
    if (visual->samples > 1) {
-      mode->sampleBuffers = 1;
       mode->samples = visual->samples;
    }
 }