summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Peres <[email protected]>2015-03-25 16:28:03 +0200
committerMartin Peres <[email protected]>2015-04-01 09:36:27 +0300
commitfa3832155100850da8346faa64c3cb30c4e86e39 (patch)
tree9e2c4f6972bc2bbee7d051ddbab9b0ec1af464a5
parent8f7338f284cdb1fef64c85e3293d2200d0cc6387 (diff)
mesa/fbo: do not assign a value that is never read later on
The issue has been detected by coverty. v2: - move the declaration of obj to the else clause (Brian Paul) v3: Review by Brian Paul - get rid of the obj declaration in favor of a direct reference Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Martin Peres <[email protected]>
-rw-r--r--src/mesa/main/fbobject.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 072e1a8c8bb..3808b560e81 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1400,7 +1400,6 @@ create_render_buffers(struct gl_context *ctx, GLsizei n, GLuint *renderbuffers,
bool dsa)
{
const char *func = dsa ? "glCreateRenderbuffers" : "glGenRenderbuffers";
- struct gl_renderbuffer *obj;
GLuint first;
GLint i;
@@ -1419,13 +1418,11 @@ create_render_buffers(struct gl_context *ctx, GLsizei n, GLuint *renderbuffers,
renderbuffers[i] = name;
if (dsa) {
- obj = allocate_renderbuffer(ctx, name, func);
+ allocate_renderbuffer(ctx, name, func);
} else {
- obj = &DummyRenderbuffer;
-
- /* insert the object into the hash table */
+ /* insert a dummy renderbuffer into the hash table */
mtx_lock(&ctx->Shared->Mutex);
- _mesa_HashInsert(ctx->Shared->RenderBuffers, name, obj);
+ _mesa_HashInsert(ctx->Shared->RenderBuffers, name, &DummyRenderbuffer);
mtx_unlock(&ctx->Shared->Mutex);
}
}