{\r
BOOL bPacked=FALSE; // default: no packed pixel support\r
\r
- if(strstr((s8 *)glGetString(GL_EXTENSIONS), // packed pixels available?\r
+ if(strstr((char *)glGetString(GL_EXTENSIONS), // packed pixels available?\r
"GL_EXT_packed_pixels")) \r
bPacked=TRUE; // -> ok\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
-int pandora_driver_mode = MODE_RAW;\r
int use_fsaa = 0;\r
\r
EGLDisplay display;\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
return TRUE;\r
}\r
\r
-void maemoGLinit(){\r
+static void initEGL(void)\r
+{\r
printf ("GL init\n");\r
\r
EGLint numConfigs;\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
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
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
else\r
printf("GLES Window Opened\n");\r
}\r
-#endif\r
\r
int GLinitialize() \r
{\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
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