gpu-gles: clean up headers and stuff

[pcsx_rearmed.git] / plugins / gpu-gles / gpuDraw.c

diff --git a/plugins/gpu-gles/gpuDraw.c b/plugins/gpu-gles/gpuDraw.c
index 4f639c1..2eaa825 100644 (file)
--- a/plugins/gpu-gles/gpuDraw.c
+++ b/plugins/gpu-gles/gpuDraw.c
@@ -308,11 +308,9 @@ void CreateScanLines(void)
 HGLRC GLCONTEXT=NULL;\r
 #endif\r
 \r
-#ifdef MAEMO_CHANGES\r
 #define MODE_RAW 0\r
 #define MODE_X11 1\r
 #define MODE_SDL 2\r
-int pandora_driver_mode = MODE_RAW;\r
 int use_fsaa = 0;\r
 \r
 EGLDisplay display;\r
@@ -345,9 +343,7 @@ EGLint attrib_list_fsaa[] =
 \r
 EGLint attrib_list[] =\r
 {\r
-       EGL_SURFACE_TYPE, EGL_WINDOW_BIT,\r
-       EGL_BUFFER_SIZE,  0,\r
-       EGL_DEPTH_SIZE,   16,\r
+//     EGL_DEPTH_SIZE,   16,\r
        EGL_NONE\r
 };\r
 \r
@@ -368,7 +364,8 @@ bool TestEGLError(const char* pszLocation)
        return TRUE;\r
 }\r
 \r
-void maemoGLinit(){\r
+static void initEGL(void)\r
+{\r
        printf ("GL init\n");\r
 \r
        EGLint numConfigs;\r
@@ -400,15 +397,6 @@ void maemoGLinit(){
        }\r
 \r
 #if defined(USE_X11)\r
-       pandora_driver_mode = MODE_X11; // TODO make configurable\r
-#else\r
-       pandora_driver_mode = MODE_RAW; // TODO make configurable\r
-#endif\r
-       \r
-    switch(pandora_driver_mode)\r
-            {            \r
-#if defined(USE_X11)\r
-        case MODE_X11:\r
             // Initializes the display and screen\r
             x11Display = XOpenDisplay( ":0" );\r
             if (!x11Display)\r
@@ -463,13 +451,9 @@ void maemoGLinit(){
             XSendEvent(x11Display, DefaultRootWindow(x11Display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);\r
 \r
             display = eglGetDisplay( (EGLNativeDisplayType)x11Display );\r
-            break;\r
-#endif\r
-        case MODE_RAW:\r
-        default:\r
+#else\r
             display = eglGetDisplay( (EGLNativeDisplayType)0 );\r
-            break;\r
-    }\r
+#endif\r
 \r
        if( display == EGL_NO_DISPLAY )\r
        {\r
@@ -492,18 +476,11 @@ void maemoGLinit(){
                printf( "GLES EGL Error: eglCreateContext failed\n" );\r
        }\r
 \r
-    switch(pandora_driver_mode)\r
-       {\r
 #if defined(USE_X11)\r
-        case MODE_X11:\r
             surface = eglCreateWindowSurface( display, config, (EGLNativeDisplayType)x11Window, NULL );\r
-            break;\r
-#endif\r
-        case MODE_RAW:\r
-        default:\r
+#else\r
             surface = eglCreateWindowSurface( display, config, (EGLNativeDisplayType)0, NULL );\r
-            break;\r
-       }\r
+#endif\r
 \r
     eglMakeCurrent( display, surface, surface, context );\r
     if (!TestEGLError("eglMakeCurrent"))\r
@@ -511,7 +488,6 @@ void maemoGLinit(){
     else\r
         printf("GLES Window Opened\n");\r
 }\r
-#endif\r
 \r
 int GLinitialize() \r
 {\r
@@ -526,9 +502,8 @@ int GLinitialize()
  // CheckWGLExtensions(dcGlobal);\r
  if(bWindowMode) ReleaseDC(hWWindow,dcGlobal);         // win mode: release dc again\r
 #endif\r
-#ifdef MAEMO_CHANGES\r
-        maemoGLinit();\r
-#endif\r
+ initEGL();\r
+\r
  //----------------------------------------------------// \r
 \r
  glViewport(rRatioRect.left,                           // init viewport by ratio rect\r
@@ -629,12 +604,9 @@ void GLcleanup()
        eglTerminate( display );\r
 \r
 #if defined(USE_X11)\r
-       if (pandora_driver_mode == MODE_X11)\r
-       {\r
                if (x11Window) XDestroyWindow(x11Display, x11Window);\r
                if (x11Colormap) XFreeColormap( x11Display, x11Colormap );\r
                if (x11Display) XCloseDisplay(x11Display);\r
-       }\r
 #endif\r
 }\r
 \r