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

mesa: Eliminate gl_config::have{Accum,Depth,Stencil}Buffer

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Adam Jackson
2019-09-06 11:51:23 -04:00
parent c4990b7b19
commit 78e0fa6bb2
13 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/state_trackers/dri/dri_screen.c
View File

@@ -426,7 +426,7 @@ dri_fill_st_visual(struct st_visual *stvis,
break; break;
} }
stvis->accum_format = (mode->haveAccumBuffer) ? stvis->accum_format = (mode->accumRedBits > 0) ?
PIPE_FORMAT_R16G16B16A16_SNORM : PIPE_FORMAT_NONE; PIPE_FORMAT_R16G16B16A16_SNORM : PIPE_FORMAT_NONE;
stvis->buffer_mask |= ST_ATTACHMENT_FRONT_LEFT_MASK; stvis->buffer_mask |= ST_ATTACHMENT_FRONT_LEFT_MASK;
@@ -441,7 +441,7 @@ dri_fill_st_visual(struct st_visual *stvis,
stvis->buffer_mask |= ST_ATTACHMENT_BACK_RIGHT_MASK; stvis->buffer_mask |= ST_ATTACHMENT_BACK_RIGHT_MASK;
} }
if (mode->haveDepthBuffer || mode->haveStencilBuffer) if (mode->depthBits > 0 || mode->stencilBits > 0)
stvis->buffer_mask |= ST_ATTACHMENT_DEPTH_STENCIL_MASK; stvis->buffer_mask |= ST_ATTACHMENT_DEPTH_STENCIL_MASK;
/* let the state tracker allocate the accum buffer */ /* let the state tracker allocate the accum buffer */
} }

4
src/gallium/state_trackers/glx/xlib/xm_api.c
View File

@@ -866,10 +866,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
vis->accumBlueBits = accum_blue_size; vis->accumBlueBits = accum_blue_size;
vis->accumAlphaBits = accum_alpha_size; vis->accumAlphaBits = accum_alpha_size;
vis->haveAccumBuffer = accum_red_size > 0;
vis->haveDepthBuffer = depth_size > 0;
vis->haveStencilBuffer = stencil_size > 0;
vis->numAuxBuffers = 0; vis->numAuxBuffers = 0;
vis->level = 0; vis->level = 0;
vis->sampleBuffers = num_samples > 1; vis->sampleBuffers = num_samples > 1;

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

@@ -369,14 +369,6 @@ driCreateConfigs(mesa_format format,
modes->samples = msaa_samples[h]; modes->samples = msaa_samples[h];
modes->sampleBuffers = modes->samples ? 1 : 0; modes->sampleBuffers = modes->samples ? 1 : 0;
modes->haveAccumBuffer = ((modes->accumRedBits +
modes->accumGreenBits +
modes->accumBlueBits +
modes->accumAlphaBits) > 0);
modes->haveDepthBuffer = (modes->depthBits > 0);
modes->haveStencilBuffer = (modes->stencilBits > 0);
modes->bindToTextureRgb = GL_TRUE; modes->bindToTextureRgb = GL_TRUE;
modes->bindToTextureRgba = GL_TRUE; modes->bindToTextureRgba = GL_TRUE;
modes->bindToMipmapTexture = GL_FALSE; modes->bindToMipmapTexture = GL_FALSE;

6
src/mesa/drivers/dri/nouveau/nouveau_context.c
View File

@@ -250,11 +250,11 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw)
attachments[i++] = __DRI_BUFFER_FRONT_LEFT; attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
if (fb->Visual.doubleBufferMode) if (fb->Visual.doubleBufferMode)
attachments[i++] = __DRI_BUFFER_BACK_LEFT; attachments[i++] = __DRI_BUFFER_BACK_LEFT;
if (fb->Visual.haveDepthBuffer && fb->Visual.haveStencilBuffer) if (fb->Visual.depthBits > 0 && fb->Visual.stencilBits > 0)
attachments[i++] = __DRI_BUFFER_DEPTH_STENCIL; attachments[i++] = __DRI_BUFFER_DEPTH_STENCIL;
else if (fb->Visual.haveDepthBuffer) else if (fb->Visual.depthBits > 0)
attachments[i++] = __DRI_BUFFER_DEPTH; attachments[i++] = __DRI_BUFFER_DEPTH;
else if (fb->Visual.haveStencilBuffer) else if (fb->Visual.stencilBits > 0)
attachments[i++] = __DRI_BUFFER_STENCIL; attachments[i++] = __DRI_BUFFER_STENCIL;
buffers = screen->dri2.loader->getBuffers(draw, &draw->w, &draw->h, buffers = screen->dri2.loader->getBuffers(draw, &draw->w, &draw->h,

6
src/mesa/drivers/dri/swrast/swrast.c
View File

@@ -584,9 +584,9 @@ dri_create_buffer(__DRIscreen * sPriv,
/* add software renderbuffers */ /* add software renderbuffers */
_swrast_add_soft_renderbuffers(fb, _swrast_add_soft_renderbuffers(fb,
GL_FALSE, /* color */ GL_FALSE, /* color */
visual->haveDepthBuffer, visual->depthBits > 0,
visual->haveStencilBuffer, visual->stencilBits > 0,
visual->haveAccumBuffer, visual->accumRedBits > 0,
GL_FALSE, /* alpha */ GL_FALSE, /* alpha */
GL_FALSE /* aux bufs */); GL_FALSE /* aux bufs */);

6
src/mesa/drivers/osmesa/osmesa.c
View File

@@ -864,9 +864,9 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist)
*/ */
_swrast_add_soft_renderbuffers(osmesa->gl_buffer, _swrast_add_soft_renderbuffers(osmesa->gl_buffer,
GL_FALSE, /* color */ GL_FALSE, /* color */
osmesa->gl_visual->haveDepthBuffer, osmesa->gl_visual->depthBits > 0,
osmesa->gl_visual->haveStencilBuffer, osmesa->gl_visual->stencilBits > 0,
osmesa->gl_visual->haveAccumBuffer, osmesa->gl_visual->accumRedBits > 0,
GL_FALSE, /* alpha */ GL_FALSE, /* alpha */
GL_FALSE /* aux */ ); GL_FALSE /* aux */ );

6
src/mesa/drivers/x11/xm_api.c
View File

@@ -338,9 +338,9 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type,
*/ */
_swrast_add_soft_renderbuffers(&b->mesa_buffer, _swrast_add_soft_renderbuffers(&b->mesa_buffer,
GL_FALSE, /* color */ GL_FALSE, /* color */
vis->mesa_visual.haveDepthBuffer, vis->mesa_visual.depthBits > 0,
vis->mesa_visual.haveStencilBuffer, vis->mesa_visual.stencilBits > 0,
vis->mesa_visual.haveAccumBuffer, vis->mesa_visual.accumRedBits > 0,
GL_FALSE, /* software alpha buffer */ GL_FALSE, /* software alpha buffer */
vis->mesa_visual.numAuxBuffers > 0 ); vis->mesa_visual.numAuxBuffers > 0 );

2
src/mesa/main/accum.c
View File

@@ -468,7 +468,7 @@ _mesa_Accum( GLenum op, GLfloat value )
return; return;
} }
if (ctx->DrawBuffer->Visual.haveAccumBuffer == 0) { if (ctx->DrawBuffer->Visual.accumRedBits == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)"); _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)");
return; return;
} }

6
src/mesa/main/clear.c
View File

@@ -203,17 +203,17 @@ clear(struct gl_context *ctx, GLbitfield mask, bool no_error)
} }
if ((mask & GL_DEPTH_BUFFER_BIT) if ((mask & GL_DEPTH_BUFFER_BIT)
&& ctx->DrawBuffer->Visual.haveDepthBuffer) { && ctx->DrawBuffer->Visual.depthBits > 0) {
bufferMask |= BUFFER_BIT_DEPTH; bufferMask |= BUFFER_BIT_DEPTH;
} }
if ((mask & GL_STENCIL_BUFFER_BIT) if ((mask & GL_STENCIL_BUFFER_BIT)
&& ctx->DrawBuffer->Visual.haveStencilBuffer) { && ctx->DrawBuffer->Visual.stencilBits > 0) {
bufferMask |= BUFFER_BIT_STENCIL; bufferMask |= BUFFER_BIT_STENCIL;
} }
if ((mask & GL_ACCUM_BUFFER_BIT) if ((mask & GL_ACCUM_BUFFER_BIT)
&& ctx->DrawBuffer->Visual.haveAccumBuffer) { && ctx->DrawBuffer->Visual.accumRedBits > 0) {
bufferMask |= BUFFER_BIT_ACCUM; bufferMask |= BUFFER_BIT_ACCUM;
} }

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

@@ -305,10 +305,6 @@ _mesa_initialize_visual( struct gl_config *vis,
vis->accumBlueBits = accumBlueBits; vis->accumBlueBits = accumBlueBits;
vis->accumAlphaBits = accumAlphaBits; vis->accumAlphaBits = accumAlphaBits;
vis->haveAccumBuffer = accumRedBits > 0;
vis->haveDepthBuffer = depthBits > 0;
vis->haveStencilBuffer = stencilBits > 0;
vis->numAuxBuffers = 0; vis->numAuxBuffers = 0;
vis->level = 0; vis->level = 0;
vis->sampleBuffers = numSamples > 0 ? 1 : 0; vis->sampleBuffers = numSamples > 0 ? 1 : 0;

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

@@ -482,7 +482,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
const struct gl_renderbuffer *rb = const struct gl_renderbuffer *rb =
fb->Attachment[BUFFER_DEPTH].Renderbuffer; fb->Attachment[BUFFER_DEPTH].Renderbuffer;
const mesa_format fmt = rb->Format; const mesa_format fmt = rb->Format;
fb->Visual.haveDepthBuffer = GL_TRUE;
fb->Visual.depthBits = _mesa_get_format_bits(fmt, GL_DEPTH_BITS); fb->Visual.depthBits = _mesa_get_format_bits(fmt, GL_DEPTH_BITS);
} }
@@ -490,7 +489,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
const struct gl_renderbuffer *rb = const struct gl_renderbuffer *rb =
fb->Attachment[BUFFER_STENCIL].Renderbuffer; fb->Attachment[BUFFER_STENCIL].Renderbuffer;
const mesa_format fmt = rb->Format; const mesa_format fmt = rb->Format;
fb->Visual.haveStencilBuffer = GL_TRUE;
fb->Visual.stencilBits = _mesa_get_format_bits(fmt, GL_STENCIL_BITS); fb->Visual.stencilBits = _mesa_get_format_bits(fmt, GL_STENCIL_BITS);
} }
@@ -498,7 +496,6 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
const struct gl_renderbuffer *rb = const struct gl_renderbuffer *rb =
fb->Attachment[BUFFER_ACCUM].Renderbuffer; fb->Attachment[BUFFER_ACCUM].Renderbuffer;
const mesa_format fmt = rb->Format; const mesa_format fmt = rb->Format;
fb->Visual.haveAccumBuffer = GL_TRUE;
fb->Visual.accumRedBits = _mesa_get_format_bits(fmt, GL_RED_BITS); fb->Visual.accumRedBits = _mesa_get_format_bits(fmt, GL_RED_BITS);
fb->Visual.accumGreenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS); fb->Visual.accumGreenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);
fb->Visual.accumBlueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS); fb->Visual.accumBlueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);

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

@@ -164,10 +164,6 @@ struct gl_config
GLuint doubleBufferMode; GLuint doubleBufferMode;
GLuint stereoMode; GLuint stereoMode;
GLboolean haveAccumBuffer;
GLboolean haveDepthBuffer;
GLboolean haveStencilBuffer;
GLint redBits, greenBits, blueBits, alphaBits; /* bits per comp */ GLint redBits, greenBits, blueBits, alphaBits; /* bits per comp */
GLuint redMask, greenMask, blueMask, alphaMask; GLuint redMask, greenMask, blueMask, alphaMask;
GLint redShift, greenShift, blueShift, alphaShift; GLint redShift, greenShift, blueShift, alphaShift;

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

@@ -407,14 +407,9 @@ st_visual_to_context_mode(const struct st_visual *visual,
mode->stencilBits = mode->stencilBits =
util_format_get_component_bits(visual->depth_stencil_format, util_format_get_component_bits(visual->depth_stencil_format,
UTIL_FORMAT_COLORSPACE_ZS, 1); UTIL_FORMAT_COLORSPACE_ZS, 1);
mode->haveDepthBuffer = mode->depthBits > 0;
mode->haveStencilBuffer = mode->stencilBits > 0;
} }
if (visual->accum_format != PIPE_FORMAT_NONE) { if (visual->accum_format != PIPE_FORMAT_NONE) {
mode->haveAccumBuffer = GL_TRUE;
mode->accumRedBits = mode->accumRedBits =
util_format_get_component_bits(visual->accum_format, util_format_get_component_bits(visual->accum_format,
UTIL_FORMAT_COLORSPACE_RGB, 0); UTIL_FORMAT_COLORSPACE_RGB, 0);