include/SDL_config_windows.h
author Sam Lantinga <slouken@libsdl.org>
Wed, 18 Oct 2017 08:52:04 -0700
changeset 11630 ad4b5d85edee
parent 11488 998f992b03ed
child 11684 eccdf37f8996
permissions -rw-r--r--
Fixed bug 3821 - Allow SDL_CreateWindow and SDL_CreateRenderer with OpenGL ES 3.0 (GLES3) for Angle (Windows)

Carlos

Angle supports GLES3 but when using these functions (SDL_CreateWindow and SDL_CreateRenderer), defaults again to GLES2.0.

A current workaround (hack) to retrieve a GLES3.0 context with Angle is:

1) set

SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);

after InitSDL AND after calling SDL_CreateWindow (before SDL_CreateRenderer)

2) Comment lines 2032-2044 in SDL_render_gles2.c, funtion GLES2_CreateRenderer

window_flags = SDL_GetWindowFlags(window);
if (!(window_flags & SDL_WINDOW_OPENGL) ||
profile_mask != SDL_GL_CONTEXT_PROFILE_ES || major != RENDERER_CONTEXT_MAJOR || minor != RENDERER_CONTEXT_MINOR) {

changed_window = SDL_TRUE;
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, RENDERER_CONTEXT_MAJOR);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, RENDERER_CONTEXT_MINOR);

if (SDL_RecreateWindow(window, window_flags | SDL_WINDOW_OPENGL) < 0) {
goto error;
}
}

This retrives a GLES3 context as confirmed using glGetString(GL_VERSION). This should be fixed by modifying a few if's.
     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 
    22 #ifndef SDL_config_windows_h_
    23 #define SDL_config_windows_h_
    24 #define SDL_config_h_
    25 
    26 #include "SDL_platform.h"
    27 
    28 /* This is a set of defines to configure the SDL features */
    29 
    30 #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
    31 #if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
    32 #define HAVE_STDINT_H   1
    33 #elif defined(_MSC_VER)
    34 typedef signed __int8 int8_t;
    35 typedef unsigned __int8 uint8_t;
    36 typedef signed __int16 int16_t;
    37 typedef unsigned __int16 uint16_t;
    38 typedef signed __int32 int32_t;
    39 typedef unsigned __int32 uint32_t;
    40 typedef signed __int64 int64_t;
    41 typedef unsigned __int64 uint64_t;
    42 #ifndef _UINTPTR_T_DEFINED
    43 #ifdef  _WIN64
    44 typedef unsigned __int64 uintptr_t;
    45 #else
    46 typedef unsigned int uintptr_t;
    47 #endif
    48 #define _UINTPTR_T_DEFINED
    49 #endif
    50 /* Older Visual C++ headers don't have the Win64-compatible typedefs... */
    51 #if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
    52 #define DWORD_PTR DWORD
    53 #endif
    54 #if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
    55 #define LONG_PTR LONG
    56 #endif
    57 #else /* !__GNUC__ && !_MSC_VER */
    58 typedef signed char int8_t;
    59 typedef unsigned char uint8_t;
    60 typedef signed short int16_t;
    61 typedef unsigned short uint16_t;
    62 typedef signed int int32_t;
    63 typedef unsigned int uint32_t;
    64 typedef signed long long int64_t;
    65 typedef unsigned long long uint64_t;
    66 #ifndef _SIZE_T_DEFINED_
    67 #define _SIZE_T_DEFINED_
    68 typedef unsigned int size_t;
    69 #endif
    70 typedef unsigned int uintptr_t;
    71 #endif /* __GNUC__ || _MSC_VER */
    72 #endif /* !_STDINT_H_ && !HAVE_STDINT_H */
    73 
    74 #ifdef _WIN64
    75 # define SIZEOF_VOIDP 8
    76 #else
    77 # define SIZEOF_VOIDP 4
    78 #endif
    79 
    80 #define HAVE_DDRAW_H 1
    81 #define HAVE_DINPUT_H 1
    82 #define HAVE_DSOUND_H 1
    83 #define HAVE_DXGI_H 1
    84 #define HAVE_XINPUT_H 1
    85 
    86 /* This is disabled by default to avoid C runtime dependencies and manifest requirements */
    87 #ifdef HAVE_LIBC
    88 /* Useful headers */
    89 #define STDC_HEADERS 1
    90 #define HAVE_CTYPE_H 1
    91 #define HAVE_FLOAT_H 1
    92 #define HAVE_LIMITS_H 1
    93 #define HAVE_MATH_H 1
    94 #define HAVE_SIGNAL_H 1
    95 #define HAVE_STDIO_H 1
    96 #define HAVE_STRING_H 1
    97 
    98 /* C library functions */
    99 #define HAVE_MALLOC 1
   100 #define HAVE_CALLOC 1
   101 #define HAVE_REALLOC 1
   102 #define HAVE_FREE 1
   103 #define HAVE_ALLOCA 1
   104 #define HAVE_QSORT 1
   105 #define HAVE_ABS 1
   106 #define HAVE_MEMSET 1
   107 #define HAVE_MEMCPY 1
   108 #define HAVE_MEMMOVE 1
   109 #define HAVE_MEMCMP 1
   110 #define HAVE_STRLEN 1
   111 #define HAVE__STRREV 1
   112 #define HAVE__STRUPR 1
   113 #define HAVE__STRLWR 1
   114 #define HAVE_STRCHR 1
   115 #define HAVE_STRRCHR 1
   116 #define HAVE_STRSTR 1
   117 #define HAVE__LTOA 1
   118 #define HAVE__ULTOA 1
   119 #define HAVE_STRTOL 1
   120 #define HAVE_STRTOUL 1
   121 #define HAVE_STRTOD 1
   122 #define HAVE_ATOI 1
   123 #define HAVE_ATOF 1
   124 #define HAVE_STRCMP 1
   125 #define HAVE_STRNCMP 1
   126 #define HAVE__STRICMP 1
   127 #define HAVE__STRNICMP 1
   128 #define HAVE_ATAN 1
   129 #define HAVE_ATAN2 1
   130 #define HAVE_ACOS  1
   131 #define HAVE_ASIN  1
   132 #define HAVE_CEIL 1
   133 #define HAVE_COS 1
   134 #define HAVE_COSF 1
   135 #define HAVE_FABS 1
   136 #define HAVE_FLOOR 1
   137 #define HAVE_LOG 1
   138 #define HAVE_POW 1
   139 #define HAVE_SIN 1
   140 #define HAVE_SINF 1
   141 #define HAVE_SQRT 1
   142 #define HAVE_SQRTF 1
   143 #define HAVE_TAN 1
   144 #define HAVE_TANF 1
   145 #define HAVE__COPYSIGN 1
   146 #if defined(_MSC_VER)
   147 /* These functions were added with the VC++ 2013 C runtime library */
   148 #if _MSC_VER >= 1800
   149 #define HAVE_STRTOLL 1
   150 #define HAVE_VSSCANF 1
   151 #define HAVE_SCALBN 1
   152 #endif
   153 /* This function is available with at least the VC++ 2008 C runtime library */
   154 #if _MSC_VER >= 1400
   155 #define HAVE__FSEEKI64 1
   156 #endif
   157 #endif
   158 #if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
   159 #define HAVE_M_PI 1
   160 #endif
   161 #else
   162 #define HAVE_STDARG_H   1
   163 #define HAVE_STDDEF_H   1
   164 #endif
   165 
   166 /* Enable various audio drivers */
   167 #define SDL_AUDIO_DRIVER_WASAPI 1
   168 #define SDL_AUDIO_DRIVER_DSOUND 1
   169 #define SDL_AUDIO_DRIVER_XAUDIO2    0
   170 #define SDL_AUDIO_DRIVER_WINMM  1
   171 #define SDL_AUDIO_DRIVER_DISK   1
   172 #define SDL_AUDIO_DRIVER_DUMMY  1
   173 
   174 /* Enable various input drivers */
   175 #define SDL_JOYSTICK_DINPUT 1
   176 #define SDL_JOYSTICK_XINPUT 1
   177 #define SDL_HAPTIC_DINPUT   1
   178 #define SDL_HAPTIC_XINPUT   1
   179 
   180 /* Enable various shared object loading systems */
   181 #define SDL_LOADSO_WINDOWS  1
   182 
   183 /* Enable various threading systems */
   184 #define SDL_THREAD_WINDOWS  1
   185 
   186 /* Enable various timer systems */
   187 #define SDL_TIMER_WINDOWS   1
   188 
   189 /* Enable various video drivers */
   190 #define SDL_VIDEO_DRIVER_DUMMY  1
   191 #define SDL_VIDEO_DRIVER_WINDOWS    1
   192 
   193 #ifndef SDL_VIDEO_RENDER_D3D
   194 #define SDL_VIDEO_RENDER_D3D    1
   195 #endif
   196 #ifndef SDL_VIDEO_RENDER_D3D11
   197 #define SDL_VIDEO_RENDER_D3D11	0
   198 #endif
   199 
   200 /* Enable OpenGL support */
   201 #ifndef SDL_VIDEO_OPENGL
   202 #define SDL_VIDEO_OPENGL    1
   203 #endif
   204 #ifndef SDL_VIDEO_OPENGL_WGL
   205 #define SDL_VIDEO_OPENGL_WGL    1
   206 #endif
   207 #ifndef SDL_VIDEO_RENDER_OGL
   208 #define SDL_VIDEO_RENDER_OGL    1
   209 #endif
   210 #ifndef SDL_VIDEO_RENDER_OGL_ES2
   211 #define SDL_VIDEO_RENDER_OGL_ES2    1
   212 #endif
   213 #ifndef SDL_VIDEO_OPENGL_ES2
   214 #define SDL_VIDEO_OPENGL_ES2    1
   215 #endif
   216 #ifndef SDL_VIDEO_OPENGL_EGL
   217 #define SDL_VIDEO_OPENGL_EGL    1
   218 #endif
   219 
   220 /* Enable Vulkan support */
   221 #define SDL_VIDEO_VULKAN 1
   222 
   223 /* Enable system power support */
   224 #define SDL_POWER_WINDOWS 1
   225 
   226 /* Enable filesystem support */
   227 #define SDL_FILESYSTEM_WINDOWS  1
   228 
   229 /* Enable assembly routines (Win64 doesn't have inline asm) */
   230 #ifndef _WIN64
   231 #define SDL_ASSEMBLY_ROUTINES   1
   232 #endif
   233 
   234 #endif /* SDL_config_windows_h_ */