Mesa (master): mesa: remove fallback RefCount == 0 pattern
Timothy Arceri
tarceri at kemper.freedesktop.org
Sat Apr 22 00:06:12 UTC 2017
Module: Mesa
Branch: master
Commit: 622a68ed3e36a6b56db35df62c5913d2d54d5ed6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=622a68ed3e36a6b56db35df62c5913d2d54d5ed6
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Fri Apr 21 13:29:46 2017 +1000
mesa: remove fallback RefCount == 0 pattern
We should never get here if this is 0 unless there is a
bug. Replace the check with an assert.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/mesa/main/arrayobj.c | 14 ++++----------
src/mesa/main/bufferobj.c | 14 ++++----------
src/mesa/main/pipelineobj.c | 14 ++++----------
src/mesa/main/samplerobj.c | 14 ++++----------
src/mesa/main/texobj.c | 14 ++++----------
src/mesa/main/transformfeedback.c | 14 +++++---------
6 files changed, 25 insertions(+), 59 deletions(-)
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index ab1b834b6d..fdb3caad95 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -208,16 +208,10 @@ _mesa_reference_vao_(struct gl_context *ctx,
if (vao) {
/* reference new array object */
mtx_lock(&vao->Mutex);
- if (vao->RefCount == 0) {
- /* this array's being deleted (look just above) */
- /* Not sure this can every really happen. Warn if it does. */
- _mesa_problem(NULL, "referencing deleted array object");
- *ptr = NULL;
- }
- else {
- vao->RefCount++;
- *ptr = vao;
- }
+ assert(vao->RefCount > 0);
+
+ vao->RefCount++;
+ *ptr = vao;
mtx_unlock(&vao->Mutex);
}
}
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 922c7d82fc..961871c91d 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -511,16 +511,10 @@ _mesa_reference_buffer_object_(struct gl_context *ctx,
if (bufObj) {
/* reference new buffer */
mtx_lock(&bufObj->Mutex);
- if (bufObj->RefCount == 0) {
- /* this buffer's being deleted (look just above) */
- /* Not sure this can every really happen. Warn if it does. */
- _mesa_problem(NULL, "referencing deleted buffer object");
- *ptr = NULL;
- }
- else {
- bufObj->RefCount++;
- *ptr = bufObj;
- }
+ assert(bufObj->RefCount > 0);
+
+ bufObj->RefCount++;
+ *ptr = bufObj;
mtx_unlock(&bufObj->Mutex);
}
}
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index c1dd8d75c7..2988c97455 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -206,16 +206,10 @@ _mesa_reference_pipeline_object_(struct gl_context *ctx,
if (obj) {
/* reference new pipeline object */
mtx_lock(&obj->Mutex);
- if (obj->RefCount == 0) {
- /* this pipeline's being deleted (look just above) */
- /* Not sure this can ever really happen. Warn if it does. */
- _mesa_problem(NULL, "referencing deleted pipeline object");
- *ptr = NULL;
- }
- else {
- obj->RefCount++;
- *ptr = obj;
- }
+ assert(obj->RefCount > 0);
+
+ obj->RefCount++;
+ *ptr = obj;
mtx_unlock(&obj->Mutex);
}
}
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 183f1d2a86..63beaf1abb 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -97,16 +97,10 @@ _mesa_reference_sampler_object_(struct gl_context *ctx,
if (samp) {
/* reference new sampler */
mtx_lock(&samp->Mutex);
- if (samp->RefCount == 0) {
- /* this sampler's being deleted (look just above) */
- /* Not sure this can every really happen. Warn if it does. */
- _mesa_problem(NULL, "referencing deleted sampler object");
- *ptr = NULL;
- }
- else {
- samp->RefCount++;
- *ptr = samp;
- }
+ assert(samp->RefCount > 0);
+
+ samp->RefCount++;
+ *ptr = samp;
mtx_unlock(&samp->Mutex);
}
}
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 00feb97552..af9baa976f 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -566,16 +566,10 @@ _mesa_reference_texobj_(struct gl_texture_object **ptr,
/* reference new texture */
assert(valid_texture_object(tex));
mtx_lock(&tex->Mutex);
- if (tex->RefCount == 0) {
- /* this texture's being deleted (look just above) */
- /* Not sure this can every really happen. Warn if it does. */
- _mesa_problem(NULL, "referencing deleted texture object");
- *ptr = NULL;
- }
- else {
- tex->RefCount++;
- *ptr = tex;
- }
+ assert(tex->RefCount > 0);
+
+ tex->RefCount++;
+ *ptr = tex;
mtx_unlock(&tex->Mutex);
}
}
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 96f3df1c96..131014ff65 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -110,16 +110,12 @@ reference_transform_feedback_object(struct gl_transform_feedback_object **ptr,
assert(!*ptr);
if (obj) {
+ assert(obj->RefCount > 0);
+
/* reference new object */
- if (obj->RefCount == 0) {
- _mesa_problem(NULL, "referencing deleted transform feedback object");
- *ptr = NULL;
- }
- else {
- obj->RefCount++;
- obj->EverBound = GL_TRUE;
- *ptr = obj;
- }
+ obj->RefCount++;
+ obj->EverBound = GL_TRUE;
+ *ptr = obj;
}
}
More information about the mesa-commit
mailing list