summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/samplerobj.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-04-21 13:29:46 +1000
committerTimothy Arceri <[email protected]>2017-04-22 10:01:15 +1000
commit622a68ed3e36a6b56db35df62c5913d2d54d5ed6 (patch)
tree974998286efcf4ed0528766666b54013e8e07c62 /src/mesa/main/samplerobj.c
parent0cc8c81902dffdd0c2e1f74e7828a6132cb70b9f (diff)
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 <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/mesa/main/samplerobj.c')
-rw-r--r--src/mesa/main/samplerobj.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 183f1d2a862..63beaf1abba 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);
}
}