From d6d16c02180929278dc49d3c9bdceece0aab189e Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 5 Dec 2017 11:09:13 -0800 Subject: meta: Initialize depth/clear values on declaration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This helps avoid compiler warningss in the next commit - everything was initialized, but it wasn't obvious to static analysis. Suggested-by: Tapani Pälli --- src/mesa/drivers/common/meta.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 1cc736cff1c..85ac7a1fed6 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3487,8 +3487,8 @@ cleartexsubimage_depth_stencil(struct gl_context *ctx, const GLvoid *clearValue, GLint zoffset) { - GLint stencilValue; - GLfloat depthValue; + GLint stencilValue = 0; + GLfloat depthValue = 0.0f; GLenum status; _mesa_meta_framebuffer_texture_image(ctx, ctx->DrawBuffer, @@ -3519,9 +3519,6 @@ cleartexsubimage_depth_stencil(struct gl_context *ctx, */ memcpy(&depthValue, depthStencilValue, sizeof depthValue); stencilValue = depthStencilValue[1] & 0xff; - } else { - depthValue = 0.0f; - stencilValue = 0; } if (texImage->_BaseFormat == GL_DEPTH_STENCIL) -- cgit v1.2.3