[Pixman] [PATCH 3/3] lookup_composite: Don't update cache in case of error

Søren Sandmann sandmann at cs.au.dk
Thu Jan 31 12:01:45 PST 2013


From: Søren Sandmann Pedersen <ssp at redhat.com>

If we fail to find a composite function, don't update the fast path
cache with the dummy compositing function.

Also make the error message state that the bug is likely caused by
issues with thread local storage.
---
 pixman/pixman-implementation.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
index c0a6436..cfb82bb 100644
--- a/pixman/pixman-implementation.c
+++ b/pixman/pixman-implementation.c
@@ -150,9 +150,16 @@ _pixman_implementation_lookup_composite (pixman_implementation_t  *toplevel,
     }
 
     /* We should never reach this point */
-    _pixman_log_error (FUNC, "No known composite function\n");
+    _pixman_log_error (
+        FUNC,
+        "No composite function found\n"
+        "\n"
+        "The most likely cause of this is that this system has issues with\n"
+        "thread local storage\n");
+
     *out_imp = NULL;
     *out_func = dummy_composite_rect;
+    return;
 
 update_cache:
     if (i)
-- 
1.7.4



More information about the Pixman mailing list