comparison src/video/pandora/SDL_pandora.c @ 5281:15a71bec4a55

merged
author Eric Wing <ewing . public |-at-| gmail . com>
date Sat, 12 Feb 2011 19:16:09 -0800
parents b530ef003506
children
comparison
equal deleted inserted replaced
5219:adfcdd311ae0 5281:15a71bec4a55
1 /* 1 /*
2 SDL - Simple DirectMedia Layer 2 SDL - Simple DirectMedia Layer
3 Copyright (C) 1997-2010 Sam Lantinga 3 Copyright (C) 1997-2011 Sam Lantinga
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Lesser General Public 6 modify it under the terms of the GNU Lesser General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2.1 of the License, or (at your option) any later version. 8 version 2.1 of the License, or (at your option) any later version.
415 PND_gl_createcontext(_THIS, SDL_Window * window) 415 PND_gl_createcontext(_THIS, SDL_Window * window)
416 { 416 {
417 SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; 417 SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
418 SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; 418 SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
419 SDL_DisplayData *didata = 419 SDL_DisplayData *didata =
420 (SDL_DisplayData *) window->display->driverdata; 420 (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
421 EGLBoolean status; 421 EGLBoolean status;
422 int32_t gfstatus; 422 int32_t gfstatus;
423 EGLint configs; 423 EGLint configs;
424 uint32_t attr_pos; 424 uint32_t attr_pos;
425 EGLint attr_value; 425 EGLint attr_value;
814 PND_gl_swapwindow(_THIS, SDL_Window * window) 814 PND_gl_swapwindow(_THIS, SDL_Window * window)
815 { 815 {
816 SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; 816 SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
817 SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; 817 SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
818 SDL_DisplayData *didata = 818 SDL_DisplayData *didata =
819 (SDL_DisplayData *) window->display->driverdata; 819 (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
820 820
821 821
822 if (phdata->egl_initialized != SDL_TRUE) { 822 if (phdata->egl_initialized != SDL_TRUE) {
823 SDL_SetError("PND: GLES initialization failed, no OpenGL ES support"); 823 SDL_SetError("PND: GLES initialization failed, no OpenGL ES support");
824 return; 824 return;