Mesa (master): meta: Initialize depth/clear values on declaration.
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Dec 7 04:38:04 UTC 2017
Module: Mesa
Branch: master
Commit: d6d16c02180929278dc49d3c9bdceece0aab189e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6d16c02180929278dc49d3c9bdceece0aab189e
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Dec 5 11:09:13 2017 -0800
meta: Initialize depth/clear values on declaration.
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 <tapani.palli at intel.com>
---
src/mesa/drivers/common/meta.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 1cc736cff1..85ac7a1fed 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)
More information about the mesa-commit
mailing list