summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-04-05 20:03:47 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-04-06 08:17:10 +1000
commit32141e53d15207888a0282d860c048a5fc815946 (patch)
treeee98a707578f10556a7b47bd3fef09d1dd31784b
parente75001811e3b66986b4ede165a0fdde703d4f05b (diff)
mesa: tidy up renderbuffer RefCount initialisation
42aaa548 changed the renderbuffer initialisation of RefCount from 1 to 0. This is inconsitent with how we use RefCount elsewhere. Also every driver implementation of NewRenderbuffer() calls _mesa_init_renderbuffer() so its safe to set it there. Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mesa/drivers/common/meta.c2
-rw-r--r--src/mesa/main/fbobject.c1
-rw-r--r--src/mesa/main/renderbuffer.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index efbc93402e1..f4c91ac22cc 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3044,8 +3044,6 @@ decompress_texture_image(struct gl_context *ctx,
return false;
}
- decompress_fbo->rb->RefCount = 1;
-
decompress_fbo->fb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF);
if (decompress_fbo->fb == NULL) {
_mesa_meta_end(ctx);
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index f73a009d626..5048327e5ed 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1323,7 +1323,6 @@ allocate_renderbuffer_locked(struct gl_context *ctx, GLuint renderbuffer,
}
assert(newRb->AllocStorage);
_mesa_HashInsertLocked(ctx->Shared->RenderBuffers, renderbuffer, newRb);
- newRb->RefCount = 1; /* referenced by hash table */
return newRb;
}
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index b0d4c8cca26..4375b5b882c 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -44,7 +44,7 @@ _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
rb->ClassID = 0;
rb->Name = name;
- rb->RefCount = 0;
+ rb->RefCount = 1;
rb->Delete = _mesa_delete_renderbuffer;
/* The rest of these should be set later by the caller of this function or