From: Igor Mitsyanko <i.mitsyanko@samsung.com>
Date: Wed, 17 Oct 2012 16:19:57 +0000 (+0400)
Subject: YaGL: make EGL driver initialization OS independant
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1331^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faced934d5c35e820acb9b3494dd6ac822565bff;p=sdk%2Femulator%2Fqemu.git

YaGL: make EGL driver initialization OS independant

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
---

diff --git a/hw/yagl_drivers/egl_glx/yagl_egl_glx.c b/hw/yagl_drivers/egl_glx/yagl_egl_glx.c
index b47f521930..e6f6963321 100644
--- a/hw/yagl_drivers/egl_glx/yagl_egl_glx.c
+++ b/hw/yagl_drivers/egl_glx/yagl_egl_glx.c
@@ -1,4 +1,3 @@
-#include "yagl_egl_glx.h"
 #include "yagl_egl_driver.h"
 #include "yagl_dyn_lib.h"
 #include "yagl_log.h"
diff --git a/hw/yagl_drivers/egl_glx/yagl_egl_glx.h b/hw/yagl_drivers/egl_glx/yagl_egl_glx.h
deleted file mode 100644
index cf91e8a824..0000000000
--- a/hw/yagl_drivers/egl_glx/yagl_egl_glx.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _QEMU_YAGL_EGL_GLX_H
-#define _QEMU_YAGL_EGL_GLX_H
-
-#include "yagl_types.h"
-
-struct yagl_egl_driver;
-
-struct yagl_egl_driver *yagl_egl_glx_create(void);
-
-#endif
diff --git a/hw/yagl_egl_driver.h b/hw/yagl_egl_driver.h
index a635a3dae8..5575a311d2 100644
--- a/hw/yagl_egl_driver.h
+++ b/hw/yagl_egl_driver.h
@@ -100,6 +100,19 @@ struct yagl_egl_driver
     void (*destroy)(struct yagl_egl_driver */*driver*/);
 };
 
+#ifdef CONFIG_YAGL_EGL_GLX
+
+struct yagl_egl_driver *yagl_egl_glx_create(void);
+
+static inline struct yagl_egl_driver *yagl_egl_create(void)
+{
+    return yagl_egl_glx_create();
+}
+
+#else
+#error Unknown EGL backend
+#endif
+
 void yagl_egl_driver_init(struct yagl_egl_driver *driver);
 void yagl_egl_driver_cleanup(struct yagl_egl_driver *driver);
 
diff --git a/hw/yagl_server.c b/hw/yagl_server.c
index 966a678ee3..369db04c38 100644
--- a/hw/yagl_server.c
+++ b/hw/yagl_server.c
@@ -8,7 +8,6 @@
 #include "yagl_egl_driver.h"
 #include "yagl_apis/egl/yagl_egl_api.h"
 #include "yagl_apis/gles2/yagl_gles2_api.h"
-#include "yagl_drivers/egl_glx/yagl_egl_glx.h"
 #include "yagl_drivers/gles2_ogl/yagl_gles2_ogl.h"
 #include <GL/gl.h>
 #include "yagl_gles2_driver.h"
@@ -39,7 +38,7 @@ struct yagl_server_state *yagl_server_state_create(void)
 
     QLIST_INIT(&ss->processes);
 
-    egl_driver = yagl_egl_glx_create();
+    egl_driver = yagl_egl_create();
 
     if (!egl_driver) {
         goto fail;