src/video/psp/SDL_pspgl.c
author Sam Lantinga
Fri, 27 Jan 2017 21:23:27 -0800
changeset 10861 71d8f9afb690
parent 10741 a32fd6b7412b
child 10960 5ebfa73d9f4b
permissions -rw-r--r--
Fixed bug 3569 - GL_UpdateViewport leaves PROJECTION matrix selected

Tom Seddon

GL_ActivateRenderer may call GL_UpdateViewport, which leaves the GL_PROJECTION matrix selected. But after GL_ResetState, the GL_MODELVIEW matrix is selected, suggesting that's the intended default state.

It seems at least like these should be consistent. Presumably GL_UpdateViewport should be doing a glMatrixMode(GL_MODELVIEW) before it finishes.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "../../SDL_internal.h"
    22 
    23 #if SDL_VIDEO_DRIVER_PSP
    24 
    25 #include <stdlib.h>
    26 #include <string.h>
    27 
    28 #include "SDL_error.h"
    29 #include "SDL_pspvideo.h"
    30 #include "SDL_pspgl_c.h"
    31 
    32 /*****************************************************************************/
    33 /* SDL OpenGL/OpenGL ES functions                                            */
    34 /*****************************************************************************/
    35 #define EGLCHK(stmt)                            \
    36     do {                                        \
    37         EGLint err;                             \
    38                                                 \
    39         stmt;                                   \
    40         err = eglGetError();                    \
    41         if (err != EGL_SUCCESS) {               \
    42             SDL_SetError("EGL error %d", err);  \
    43             return 0;                           \
    44         }                                       \
    45     } while (0)
    46 
    47 int
    48 PSP_GL_LoadLibrary(_THIS, const char *path)
    49 {
    50   return 0;
    51 }
    52 
    53 /* pspgl doesn't provide this call, so stub it out since SDL requires it.
    54 #define GLSTUB(func,params) void func params {}
    55 
    56 GLSTUB(glOrtho,(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
    57                     GLdouble zNear, GLdouble zFar))
    58 */
    59 void *
    60 PSP_GL_GetProcAddress(_THIS, const char *proc)
    61 {
    62         return eglGetProcAddress(proc);
    63 }
    64 
    65 void
    66 PSP_GL_UnloadLibrary(_THIS)
    67 {
    68         eglTerminate(_this->gl_data->display);
    69 }
    70 
    71 static EGLint width = 480;
    72 static EGLint height = 272;
    73 
    74 SDL_GLContext
    75 PSP_GL_CreateContext(_THIS, SDL_Window * window)
    76 {
    77 
    78     SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
    79 
    80         EGLint attribs[32];
    81         EGLDisplay display;
    82         EGLContext context;
    83         EGLSurface surface;
    84         EGLConfig config;
    85         EGLint num_configs;
    86         int i;
    87 
    88 
    89     /* EGL init taken from glutCreateWindow() in PSPGL's glut.c. */
    90         EGLCHK(display = eglGetDisplay(0));
    91         EGLCHK(eglInitialize(display, NULL, NULL));
    92     wdata->uses_gles = SDL_TRUE;
    93         window->flags |= SDL_WINDOW_FULLSCREEN;
    94 
    95         /* Setup the config based on SDL's current values. */
    96         i = 0;
    97         attribs[i++] = EGL_RED_SIZE;
    98         attribs[i++] = _this->gl_config.red_size;
    99         attribs[i++] = EGL_GREEN_SIZE;
   100         attribs[i++] = _this->gl_config.green_size;
   101         attribs[i++] = EGL_BLUE_SIZE;
   102         attribs[i++] = _this->gl_config.blue_size;
   103         attribs[i++] = EGL_DEPTH_SIZE;
   104         attribs[i++] = _this->gl_config.depth_size;
   105 
   106         if (_this->gl_config.alpha_size)
   107         {
   108             attribs[i++] = EGL_ALPHA_SIZE;
   109             attribs[i++] = _this->gl_config.alpha_size;
   110         }
   111         if (_this->gl_config.stencil_size)
   112         {
   113             attribs[i++] = EGL_STENCIL_SIZE;
   114             attribs[i++] = _this->gl_config.stencil_size;
   115         }
   116 
   117         attribs[i++] = EGL_NONE;
   118 
   119         EGLCHK(eglChooseConfig(display, attribs, &config, 1, &num_configs));
   120 
   121         if (num_configs == 0)
   122         {
   123             SDL_SetError("No valid EGL configs for requested mode");
   124             return 0;
   125         }
   126 
   127         EGLCHK(eglGetConfigAttrib(display, config, EGL_WIDTH, &width));
   128         EGLCHK(eglGetConfigAttrib(display, config, EGL_HEIGHT, &height));
   129 
   130         EGLCHK(context = eglCreateContext(display, config, NULL, NULL));
   131         EGLCHK(surface = eglCreateWindowSurface(display, config, 0, NULL));
   132         EGLCHK(eglMakeCurrent(display, surface, surface, context));
   133 
   134         _this->gl_data->display = display;
   135         _this->gl_data->context = context;
   136         _this->gl_data->surface = surface;
   137 
   138 
   139     return context;
   140 }
   141 
   142 int
   143 PSP_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
   144 {
   145         if (!eglMakeCurrent(_this->gl_data->display, _this->gl_data->surface,
   146                           _this->gl_data->surface, _this->gl_data->context))
   147         {
   148             return SDL_SetError("Unable to make EGL context current");
   149         }
   150     return 0;
   151 }
   152 
   153 int
   154 PSP_GL_SetSwapInterval(_THIS, int interval)
   155 {
   156     EGLBoolean status;
   157     status = eglSwapInterval(_this->gl_data->display, interval);
   158     if (status == EGL_TRUE) {
   159         /* Return success to upper level */
   160         _this->gl_data->swapinterval = interval;
   161         return 0;
   162     }
   163     /* Failed to set swap interval */
   164     return SDL_SetError("Unable to set the EGL swap interval");
   165 }
   166 
   167 int
   168 PSP_GL_GetSwapInterval(_THIS)
   169 {
   170     return _this->gl_data->swapinterval;
   171 }
   172 
   173 int
   174 PSP_GL_SwapWindow(_THIS, SDL_Window * window)
   175 {
   176     if (!eglSwapBuffers(_this->gl_data->display, _this->gl_data->surface)) {
   177         return SDL_SetError("!eglSwapBuffers() failed");
   178     }
   179     return 0;
   180 }
   181 
   182 void
   183 PSP_GL_DeleteContext(_THIS, SDL_GLContext context)
   184 {
   185     SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
   186     EGLBoolean status;
   187 
   188     if (phdata->egl_initialized != SDL_TRUE) {
   189         SDL_SetError("PSP: GLES initialization failed, no OpenGL ES support");
   190         return;
   191     }
   192 
   193     /* Check if OpenGL ES connection has been initialized */
   194     if (_this->gl_data->display != EGL_NO_DISPLAY) {
   195         if (context != EGL_NO_CONTEXT) {
   196             status = eglDestroyContext(_this->gl_data->display, context);
   197             if (status != EGL_TRUE) {
   198                 /* Error during OpenGL ES context destroying */
   199                 SDL_SetError("PSP: OpenGL ES context destroy error");
   200                 return;
   201             }
   202         }
   203     }
   204 
   205     return;
   206 }
   207 
   208 #endif /* SDL_VIDEO_DRIVER_PSP */
   209 
   210 /* vi: set ts=4 sw=4 expandtab: */