OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove redundant gl_config::sampleBuffers

Browse Source 
This is just !!samples.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9817>
This commit is contained in:
Adam Jackson
2021-03-24 13:45:20 -04:00
committed by Marge Bot
parent 4fbe1cbe4c
commit 4daef7ffe3
6 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/dri/dri_screen.c
View File

@@ -425,7 +425,7 @@ dri_fill_st_visual(struct st_visual *stvis,
return; return;
} }
if (mode->sampleBuffers) { if (mode->samples > 0) {
stvis->samples = mode->samples; stvis->samples = mode->samples;
} }

5
src/mesa/drivers/dri/common/utils.c
View File

@@ -359,7 +359,6 @@ driCreateConfigs(mesa_format format,
} }
modes->samples = msaa_samples[h]; modes->samples = msaa_samples[h];
modes->sampleBuffers = modes->samples ? 1 : 0;
modes->sRGBCapable = is_srgb; modes->sRGBCapable = is_srgb;
modes->mutableRenderBuffer = mutable_render_buffer; modes->mutableRenderBuffer = mutable_render_buffer;
@@ -437,7 +436,9 @@ driGetConfigAttribIndex(const __DRIconfig *config,
__ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE, accumGreenBits); __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE, accumGreenBits);
__ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE, accumBlueBits); __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE, accumBlueBits);
__ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE, accumAlphaBits); __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); __ATTRIB(__DRI_ATTRIB_SAMPLES, samples);
case __DRI_ATTRIB_RENDER_TYPE: case __DRI_ATTRIB_RENDER_TYPE:
/* no support for color index mode */ /* no support for color index mode */

1
src/mesa/main/context.c
View File

@@ -305,7 +305,6 @@ _mesa_initialize_visual( struct gl_config *vis,
vis->accumBlueBits = accumBlueBits; vis->accumBlueBits = accumBlueBits;
vis->accumAlphaBits = accumAlphaBits; vis->accumAlphaBits = accumAlphaBits;
vis->sampleBuffers = numSamples > 0 ? 1 : 0;
vis->samples = numSamples; vis->samples = numSamples;
return GL_TRUE; return GL_TRUE;

1
src/mesa/main/framebuffer.c
View File

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

1
src/mesa/main/mtypes.h
View File

@@ -171,7 +171,6 @@ struct gl_config
GLint stencilBits; GLint stencilBits;
/* ARB_multisample / SGIS_multisample */ /* ARB_multisample / SGIS_multisample */
GLint sampleBuffers;
GLuint samples; GLuint samples;
/* OML_swap_method */ /* OML_swap_method */

1
src/mesa/state_tracker/st_manager.c
View File

@@ -424,7 +424,6 @@ st_visual_to_context_mode(const struct st_visual *visual,
} }
if (visual->samples > 1) { if (visual->samples > 1) {
mode->sampleBuffers = 1;
mode->samples = visual->samples; mode->samples = visual->samples;
} }
} }