search

mupen64plus / mupen64plus-video-rice

Video plugin for the Mupen64Plus v2.0 project, using OpenGL. This plugin is based on the RiceVideoLinux plugin from earlier versions of Mupen64Plus.
31 stars 40 forks source link

Fix GLES regression... #53

Closed gizmo98 closed 9 years ago

gizmo98 commented 9 years ago

...introduced with https://github.com/mupen64plus/mupen64plus-video-rice/pull/52

Narann commented 9 years ago

I'm not sure you actually "fix" the problem, just revert back to it initial state (which was not good IMHO). I think the problem came form https://github.com/mupen64plus/mupen64plus-video-rice/blob/master/src/OGLExtensions.cpp#L22.

I would have replaced #include <SDL_opengl.h> by #include "osal_opengl.h" in OGLExtensions.cpp instead.

gizmo98 commented 9 years ago

We only need Extensions if USE_GLES is not defined. I added "#ifndef USE_GLES" so the code will not be used if USE_GLES is defined.

Any reason the travis build timed out?

Narann commented 9 years ago

We only need Extensions if USE_GLES is not defined.

I'm surprised. Are you sure? OGLExtension.cpp define function pointers to pgl functions used everywhere.

gizmo98 commented 9 years ago

OGLExtensions.h is only included in OGLRender.cpp. OGLRender.cpp has already #ifndef USE_GLES around this include. Don't know how this header file can be necessary if it is not included?!

richard42 commented 9 years ago

Narann, do you have any suggestions for a better fix for this? We need to resolve this before the release.

Narann commented 9 years ago

Oups! My bad! :)