various spew

2 files changed, 19 insertions, 0 deletions

diff --git a/server/red_worker.c b/server/red_worker.c
index c05d239..e508b3d 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -1216,6 +1216,9 @@ static inline void validate_surface(RedWorker *worker, uint32_t surface_id)
 {
     spice_warn_if(surface_id >= worker->n_surfaces);
     if (!worker->surfaces[surface_id].context.canvas) {
+        spice_printerr ("canvas address is %p for %d (and is NULL)\n",
+                        &(worker->surfaces[surface_id].context.canvas), surface_id);
+    
         spice_printerr("failed on %d", surface_id);
         spice_warn_if(!worker->surfaces[surface_id].context.canvas);
     }
@@ -9213,6 +9216,8 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
     RedSurface *surface = &worker->surfaces[surface_id];
     uint32_t i;
 
+    spice_printerr ("Create surface %d: %d\n", surface_id, format);
+    
     if (stride >= 0) {
         spice_critical("Untested path stride >= 0");
     }
@@ -9248,8 +9253,16 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
                 red_worker_push_surface_image(worker, surface_id);
             }
         }
+        if (surface->context.canvas)
+        {
+            spice_printerr ("%d has a canvas\n", surface_id);
+            spice_printerr ("canvas address is %p for %d (and is NULL)\n",
+                            &(surface->context.canvas), surface_id);
+        }
         return;
     }
+    else
+        spice_printerr ("invalid renderer for %d\n", surface_id);
 
     for (i = 0; i < worker->num_renderers; i++) {
         surface->context.canvas = create_canvas_for_surface(worker, surface, worker->renderers[i],
@@ -9263,10 +9276,16 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
                     red_worker_push_surface_image(worker, surface_id);
                 }
             }
+            spice_printerr ("%d has a canvas\n", surface_id);
+            spice_printerr ("canvas address is %p for %d (and is NULL)\n",
+                            &(surface->context.canvas), surface_id);
             return;
         }
     }
 
+    if (!surface->context.canvas)
+        spice_printerr ("no canvas for %d\n", surface_id);
+
     spice_critical("unable to create drawing canvas");
 }
 
diff --git a/spice-common b/spice-common
-Subproject 38f86f4e3587edd71f656c10705fd64a15d08f8
+Subproject d5191bc030e42f7e2128d35184d523011c5acca