X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/78c828aae07db0b15a66577d9230cb848fe536fa..899dc0f3d28c8321954f041ebd0c5611aec25857:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 53bf7f09..3231aab3 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -12,8 +12,8 @@
 #include <list>
 
 #include <string>
-#include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
+#include <lib/base/message.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
@@ -50,7 +50,11 @@ struct gOpcode
 		
 		flush,
 		
-		end,shutdown
+		waitVSync,
+		flip,
+		notify,
+		
+		shutdown
 	} opcode;
 
 	gDC *dc;
@@ -128,41 +132,38 @@ struct gOpcode
 			int rel;
 		} *setOffset;
 	} parm;
-
-	int flags;
 };
 
+#define MAXSIZE 1024
+
 		/* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public iObject
+class gRC: public iObject, public Object
 {
 DECLARE_REF(gRC);
 private:
+	friend class gPainter;
 	static gRC *instance;
-	
+
+#ifndef SYNC_PAINT
 	static void *thread_wrapper(void *ptr);
 	pthread_t the_thread;
+	pthread_mutex_t mutex;
+	pthread_cond_t cond;
+#endif
 	void *thread();
 
-	queueRingBuffer<gOpcode> queue;
+	gOpcode queue[MAXSIZE];
+	int rp, wp;
+
+	eFixedMessagePump<int> m_notify_pump;
+	void recv_notify(const int &i);
 public:
-	eLock queuelock;
 	gRC();
 	virtual ~gRC();
 
-	void submit(const gOpcode &o)
-	{
-		static int collected=0;
-		queue.enqueue(o);
-		collected++;
-//		if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
-		{
-			queuelock.unlock(collected);
-#ifdef SYNC_PAINT
-			thread();
-#endif
-			collected=0;
-		}
-	}
+	void submit(const gOpcode &o);
+
+	Signal0<void> notify;
 
 	static gRC *getInstance();
 };
@@ -211,7 +212,12 @@ public:
 	void fill(const gRegion &area);
 	
 	void clear();
-	
+
+	enum
+	{
+		BT_ALPHATEST = 1
+	};
+
 	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
 	void setPalette(gRGB *colors, int start=0, int len=256);
@@ -229,6 +235,10 @@ public:
 	void clippop();
 
 	void flush();
+	
+	void waitVSync();
+	void flip();
+	void notify();
 };
 
 class gDC: public iObject