[Spice-commits] server/red_worker.c

[Frediano Ziglio]

 server/red_worker.c |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit 1d7b3ad93b61be1bbb7e3b571a10843592400844
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue Sep 10 21:22:42 2013 +0200

    Remove DRAW_ALL
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red_worker.c b/server/red_worker.c
index c96c60a..c6b1a96 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -96,10 +96,7 @@
 //#define COMPRESS_STAT
 //#define DUMP_BITMAP
 //#define RED_WORKER_STAT
-/* TODO: DRAW_ALL is broken. */
-//#define DRAW_ALL
 //#define COMPRESS_DEBUG
-//#define DEBUG_CURSORS
 
 #define CMD_RING_POLL_TIMEOUT 10 //milli
 #define CMD_RING_POLL_RETRIES 200
@@ -1038,15 +1035,10 @@ typedef struct BitmapData {
 static inline int validate_surface(RedWorker *worker, uint32_t surface_id);
 static void red_draw_qxl_drawable(RedWorker *worker, Drawable *drawable);
 static void red_current_flush(RedWorker *worker, int surface_id);
-#ifdef DRAW_ALL
-#define red_update_area(worker, rect, surface_id)
-#define red_draw_drawable(worker, item)
-#else
 static void red_draw_drawable(RedWorker *worker, Drawable *item);
 static void red_update_area(RedWorker *worker, const SpiceRect *area, int surface_id);
 static void red_update_area_till(RedWorker *worker, const SpiceRect *area, int surface_id,
                                  Drawable *last);
-#endif
 static void red_release_cursor(RedWorker *worker, CursorItem *cursor);
 static inline void release_drawable(RedWorker *worker, Drawable *item);
 static void red_display_release_stream(RedWorker *worker, StreamAgent *agent);
@@ -4107,9 +4099,6 @@ static inline void red_process_drawable(RedWorker *worker, RedDrawable *red_draw
             worker->transparent_count++;
         }
         red_pipes_add_drawable(worker, drawable);
-#ifdef DRAW_ALL
-        red_draw_qxl_drawable(worker, drawable);
-#endif
     }
 cleanup:
     release_drawable(worker, drawable);
@@ -4391,8 +4380,6 @@ static void red_draw_qxl_drawable(RedWorker *worker, Drawable *drawable)
     }
 }
 
-#ifndef DRAW_ALL
-
 static void red_draw_drawable(RedWorker *worker, Drawable *drawable)
 {
     red_flush_source_surfaces(worker, drawable);
@@ -4556,8 +4543,6 @@ static void red_update_area(RedWorker *worker, const SpiceRect *area, int surfac
     validate_area(worker, area, surface_id);
 }
 
-#endif
-
 static inline void free_cursor_item(RedWorker *worker, CursorItem *item);
 
 static void red_release_cursor(RedWorker *worker, CursorItem *cursor)