Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable SDL_VIDEO_OPENGL on ANGLE #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Disable SDL_VIDEO_OPENGL on ANGLE #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3f400d0
Disable SDL_VIDEO_OPENGL on ANGLE
May 2, 2015
4025124
Merge remote-tracking branch 'origin/master'
Jun 14, 2015
35e4610
Enable SDL_EGL_SetSwapInterval
Jul 24, 2015
bfdc4c0
Merge commit '0b87529998091bb42e287d38e40fd10b7e0eec74'
Sep 23, 2015
1a703d9
Merge remote-tracking branch 'remotes/origin/master'
Apr 20, 2016
410b7f6
Disable OpenGL renderers
May 5, 2016
a25eea1
Edit android config
May 5, 2016
6349ed2
Disable unused features
May 19, 2016
babbeed
Merge remote-tracking branch 'remotes/origin/master'
Nov 1, 2016
6c1c2f8
Merge remote-tracking branch 'remotes/origin/master' into HEAD
Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/SDL_config_android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
#define SIZEOF_VOIDP 4

/* Enable various audio drivers */
#define SDL_AUDIO_DRIVER_ANDROID 1
#define SDL_AUDIO_DRIVER_DUMMY 1
#define SDL_AUDIO_DRIVER_ANDROID 0
#define SDL_AUDIO_DRIVER_DUMMY 0

/* Enable various input drivers */
#define SDL_JOYSTICK_ANDROID 1
Expand All @@ -133,11 +133,11 @@
#define SDL_VIDEO_DRIVER_ANDROID 1

/* Enable OpenGL ES */
#define SDL_VIDEO_OPENGL_ES 1
#define SDL_VIDEO_OPENGL_ES 0
#define SDL_VIDEO_OPENGL_ES2 1
#define SDL_VIDEO_OPENGL_EGL 1
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_RENDER_OGL_ES2 1
#define SDL_VIDEO_RENDER_OGL_ES 0
#define SDL_VIDEO_RENDER_OGL_ES2 0

/* Enable system power support */
#define SDL_POWER_ANDROID 1
Expand Down
8 changes: 4 additions & 4 deletions include/configs/linux/SDL_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
/* #undef SDL_AUDIO_DRIVER_HAIKU */
/* #undef SDL_AUDIO_DRIVER_BSD */
/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
#define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1
#define SDL_AUDIO_DRIVER_DISK 0
#define SDL_AUDIO_DRIVER_DUMMY 0
/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
/* #undef SDL_AUDIO_DRIVER_DSOUND */
/* #undef SDL_AUDIO_DRIVER_ESD */
Expand All @@ -207,7 +207,7 @@
/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_SNDIO */
/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
#define SDL_AUDIO_DRIVER_OSS 1
#define SDL_AUDIO_DRIVER_OSS 0
/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
/* #undef SDL_AUDIO_DRIVER_PAUDIO */
/* #undef SDL_AUDIO_DRIVER_QSA */
Expand Down Expand Up @@ -293,7 +293,7 @@

/* #undef SDL_VIDEO_RENDER_D3D */
/* #undef SDL_VIDEO_RENDER_D3D11 */
#define SDL_VIDEO_RENDER_OGL 1
#define SDL_VIDEO_RENDER_OGL 0
/* #undef SDL_VIDEO_RENDER_OGL_ES */
/* #undef SDL_VIDEO_RENDER_OGL_ES2 */
/* #undef SDL_VIDEO_RENDER_DIRECTFB */
Expand Down
14 changes: 7 additions & 7 deletions include/configs/windows/SDL_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ typedef unsigned int uintptr_t;
#endif

/* Enable various audio drivers */
#define SDL_AUDIO_DRIVER_DSOUND 1
#define SDL_AUDIO_DRIVER_DSOUND 0
#define SDL_AUDIO_DRIVER_XAUDIO2 0
#define SDL_AUDIO_DRIVER_WINMM 1
#define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1
#define SDL_AUDIO_DRIVER_WINMM 0
#define SDL_AUDIO_DRIVER_DISK 0
#define SDL_AUDIO_DRIVER_DUMMY 0

/* Enable various input drivers */
#define SDL_JOYSTICK_DINPUT 1
Expand Down Expand Up @@ -198,7 +198,7 @@ typedef unsigned int uintptr_t;
#define SDL_VIDEO_OPENGL_WGL 1
#endif
#ifndef SDL_VIDEO_RENDER_OGL
#define SDL_VIDEO_RENDER_OGL 1
#define SDL_VIDEO_RENDER_OGL 0
#endif
#ifndef SDL_VIDEO_RENDER_OGL_ES2
#define SDL_VIDEO_RENDER_OGL_ES2 0
Expand All @@ -214,7 +214,7 @@ typedef unsigned int uintptr_t;

/* Enable OpenGL support (ES2/ANGLE) */
#ifndef SDL_VIDEO_OPENGL
#define SDL_VIDEO_OPENGL 1
#define SDL_VIDEO_OPENGL 0
#endif
#ifndef SDL_VIDEO_OPENGL_WGL
#define SDL_VIDEO_OPENGL_WGL 0
Expand All @@ -223,7 +223,7 @@ typedef unsigned int uintptr_t;
#define SDL_VIDEO_RENDER_OGL 0
#endif
#ifndef SDL_VIDEO_RENDER_OGL_ES2
#define SDL_VIDEO_RENDER_OGL_ES2 1
#define SDL_VIDEO_RENDER_OGL_ES2 0
#endif
#ifndef SDL_VIDEO_OPENGL_ES2
#define SDL_VIDEO_OPENGL_ES2 1
Expand Down
3 changes: 2 additions & 1 deletion src/video/windows/SDL_windowsopengles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ WIN_GLES_SetSwapInterval(_THIS, int interval)
* from working if we do (the window contents freeze and don't swap properly). So, we ignore
* the request for now.
*/
SDL_Log("WARNING: Ignoring SDL_GL_SetSwapInterval call due to ANGLE bug");
//SDL_Log("WARNING: Ignoring SDL_GL_SetSwapInterval call due to ANGLE bug");
SDL_EGL_SetSwapInterval(_this, interval);
return 0;
}

Expand Down