gpu-gles: clean up headers and stuff

diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile
index 4b61b6f..8a3f244 100644 (file)
--- a/plugins/gpu-gles/Makefile
+++ b/plugins/gpu-gles/Makefile
@@ -15,7 +15,7 @@ endif
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8\r
 # note: the below causes strange bugs/crashes\r
 #CFLAGS += -mfloat-abi=softfp\r
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8\r
 # note: the below causes strange bugs/crashes\r
 #CFLAGS += -mfloat-abi=softfp\r

-CFLAGS += -DMAEMO_CHANGES # -DUSE_X11\r
+#CFLAGS += -DUSE_X11\r

 CFLAGS += -I$(PREFIX)include\r
 \r
 TARGET = gpuGLES.so\r
 CFLAGS += -I$(PREFIX)include\r
 \r
 TARGET = gpuGLES.so\r

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
 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
 #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
 int use_fsaa = 0;\r
 \r
 EGLDisplay display;\r


@@ -345,9 +343,7 @@ EGLint attrib_list_fsaa[] =
 \r
 EGLint attrib_list[] =\r
 {\r
 \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
        EGL_NONE\r
 };\r
 \r


@@ -368,7 +364,8 @@ bool TestEGLError(const char* pszLocation)
        return TRUE;\r
 }\r
 \r
        return TRUE;\r
 }\r
 \r

-void maemoGLinit(){\r
+static void initEGL(void)\r
+{\r

        printf ("GL init\n");\r
 \r
        EGLint numConfigs;\r
        printf ("GL init\n");\r
 \r
        EGLint numConfigs;\r


@@ -400,15 +397,6 @@ void maemoGLinit(){
        }\r
 \r
 #if defined(USE_X11)\r
        }\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
             // 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
             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
             display = eglGetDisplay( (EGLNativeDisplayType)0 );\r

-            break;\r
-    }\r
+#endif\r

 \r
        if( display == EGL_NO_DISPLAY )\r
        {\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
                printf( "GLES EGL Error: eglCreateContext failed\n" );\r
        }\r
 \r

-    switch(pandora_driver_mode)\r
-       {\r

 #if defined(USE_X11)\r
 #if defined(USE_X11)\r

-        case MODE_X11:\r

             surface = eglCreateWindowSurface( display, config, (EGLNativeDisplayType)x11Window, NULL );\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
             surface = eglCreateWindowSurface( display, config, (EGLNativeDisplayType)0, NULL );\r

-            break;\r
-       }\r
+#endif\r

 \r
     eglMakeCurrent( display, surface, surface, context );\r
     if (!TestEGLError("eglMakeCurrent"))\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
     else\r
         printf("GLES Window Opened\n");\r
 }\r

-#endif\r

 \r
 int GLinitialize() \r
 {\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
  // 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
  //----------------------------------------------------// \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
        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
                if (x11Window) XDestroyWindow(x11Display, x11Window);\r
                if (x11Colormap) XFreeColormap( x11Display, x11Colormap );\r
                if (x11Display) XCloseDisplay(x11Display);\r

-       }\r

 #endif\r
 }\r
 \r
 #endif\r
 }\r
 \r

diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h
index 8d30814..f88b37b 100644 (file)
--- a/plugins/gpu-gles/gpuExternals.h
+++ b/plugins/gpu-gles/gpuExternals.h
@@ -33,19 +33,12 @@
 extern "C" {\r
 #endif\r
 \r
 extern "C" {\r
 #endif\r
 \r

-#ifndef _WINDOWS\r

 #ifdef __NANOGL__\r
 #include <gl/gl.h>\r
 #include <gl/egl.h>\r
 #else\r
 #ifdef __NANOGL__\r
 #include <gl/gl.h>\r
 #include <gl/egl.h>\r
 #else\r

-#ifdef SOFT_LINKAGE\r
-#pragma softfp_linkage\r
-#endif\r
-#include <GLES/gl.h> // for opengl es types\r
-#ifdef SOFT_LINKAGE\r
-#pragma no_softfp_linkage\r
-#endif\r
-#endif\r
+#include <GLES/gl.h>\r
+#include <GLES/glext.h>\r

 #endif\r
 \r
 #ifdef __NANOGL__\r
 #endif\r
 \r
 #ifdef __NANOGL__\r

diff --git a/plugins/gpu-gles/gpuPlugin.c b/plugins/gpu-gles/gpuPlugin.c
index 81b7f05..368c5ce 100644 (file)
--- a/plugins/gpu-gles/gpuPlugin.c
+++ b/plugins/gpu-gles/gpuPlugin.c
@@ -560,9 +560,7 @@ long CALLBACK GPUopen(int hwndGPU)
        #ifdef _WINDOWS\r
         iResX=240;iResY=320;\r
        #endif\r
        #ifdef _WINDOWS\r
         iResX=240;iResY=320;\r
        #endif\r

-#ifdef MAEMO_CHANGES\r
-         iResX=800;iResY=480;\r
-#endif\r
+        iResX=800;iResY=480;\r

         iColDepth=8;\r
         bChangeRes=FALSE;\r
        #ifdef _WINDOWS\r
         iColDepth=8;\r
         bChangeRes=FALSE;\r
        #ifdef _WINDOWS\r

diff --git a/plugins/gpu-gles/gpuPlugin.h b/plugins/gpu-gles/gpuPlugin.h
index e9a66af..768ebe1 100644 (file)
--- a/plugins/gpu-gles/gpuPlugin.h
+++ b/plugins/gpu-gles/gpuPlugin.h
@@ -46,34 +46,9 @@ extern "C" {
 #define GREEN(x) ((x>>8) & 0xff)\r
 #define COLOR(x) (x & 0xffffff)\r
 \r
 #define GREEN(x) ((x>>8) & 0xff)\r
 #define COLOR(x) (x & 0xffffff)\r
 \r

-#ifdef _WINDOWS\r
-#include "Externals.h"\r
-#include "plugin.h"\r
-#include <gl/gl.h>\r
-#else\r
-//#ifndef MAEMO_CHANGES\r
-//     #include "psxCommon.h"\r
-//#else\r
-//     #include "../psxCommon.h"\r
-//#endif\r
+\r

 #include "gpuExternals.h"\r
 #include "gpuExternals.h"\r

-#ifdef __NANOGL__\r
-#include <gl/gl.h>\r
-#else\r
-#ifdef SOFT_LINKAGE\r
-#pragma softfp_linkage\r
-#endif\r
-#ifndef MAEMO_CHANGES\r
-       #include <gles/gl.h> // for opengl es types \r
-       #include <gles/egltypes.h>\r
-#else\r
-#include "gpuStdafx.h"\r
-#endif\r
-#ifdef SOFT_LINKAGE\r
-#pragma no_softfp_linkage\r
-#endif\r
-#endif\r
-#endif\r
+\r

 /////////////////////////////////////////////////////////////////////////////\r
 \r
 #define CALLBACK\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 #define CALLBACK\r

diff --git a/plugins/gpu-gles/gpuStdafx.h b/plugins/gpu-gles/gpuStdafx.h
index bc34898..3a6a1c5 100644 (file)
--- a/plugins/gpu-gles/gpuStdafx.h
+++ b/plugins/gpu-gles/gpuStdafx.h
@@ -66,21 +66,9 @@ extern "C" {
 #ifdef SOFT_LINKAGE\r
 #pragma softfp_linkage\r
 #endif\r
 #ifdef SOFT_LINKAGE\r
 #pragma softfp_linkage\r
 #endif\r

-#ifdef MAEMO_CHANGES\r
-\r
-       //#include <GLES/glplatform.h>\r
-       #include <GLES/gl.h>\r
-       //#include <GLES/glext.h>\r
-       #include <GLES/EGL/egl.h>\r
-       //#include "../maemo/minimal.h"\r
-       //#include <gdk/gdkx.h>\r
-       //#include <gdk/gdk.h>\r
-\r
-\r
-#else\r
-       #include <gles/gl.h> // for opengl es types \r
-       #include <gles/egltypes.h>\r
-#endif\r
+#include <GLES/gl.h> // for opengl es types \r
+//#include <GLES/egltypes.h>\r
+#include <EGL/egl.h>\r

 #ifdef SOFT_LINKAGE\r
 #pragma no_softfp_linkage\r
 #endif\r
 #ifdef SOFT_LINKAGE\r
 #pragma no_softfp_linkage\r
 #endif\r