Skip to content

Commit

Permalink
sokol_app.h: remove leftover mentions of GL 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
floooh committed Jun 24, 2024
1 parent 335aa56 commit b1221d1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sokol_app.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
- makes the rendered frame visible
- provides keyboard-, mouse- and low-level touch-events
- platforms: MacOS, iOS, HTML5, Win32, Linux/RaspberryPi, Android
- 3D-APIs: Metal, D3D11, GL3.2, GLES3, WebGL, WebGL2, NOAPI
- 3D-APIs: Metal, D3D11, GL4.1, GL4.3, GLES3, WebGL, WebGL2, NOAPI
FEATURE/PLATFORM MATRIX
=======================
Expand Down Expand Up @@ -1554,7 +1554,7 @@ typedef struct sapp_allocator {
#define _SAPP_LOG_ITEMS \
_SAPP_LOGITEM_XMACRO(OK, "Ok") \
_SAPP_LOGITEM_XMACRO(MALLOC_FAILED, "memory allocation failed") \
_SAPP_LOGITEM_XMACRO(MACOS_INVALID_NSOPENGL_PROFILE, "macos: invalid NSOpenGLProfile (valid choices are 1.0, 3.2 and 4.1)") \
_SAPP_LOGITEM_XMACRO(MACOS_INVALID_NSOPENGL_PROFILE, "macos: invalid NSOpenGLProfile (valid choices are 1.0 and 4.1)") \
_SAPP_LOGITEM_XMACRO(WIN32_LOAD_OPENGL32_DLL_FAILED, "failed loading opengl32.dll") \
_SAPP_LOGITEM_XMACRO(WIN32_CREATE_HELPER_WINDOW_FAILED, "failed to create helper window") \
_SAPP_LOGITEM_XMACRO(WIN32_HELPER_WINDOW_GETDC_FAILED, "failed to get helper window DC") \
Expand All @@ -1567,7 +1567,7 @@ typedef struct sapp_allocator {
_SAPP_LOGITEM_XMACRO(WIN32_WGL_SET_PIXELFORMAT_FAILED, "failed to set selected pixel format") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_ARB_CREATE_CONTEXT_REQUIRED, "ARB_create_context required") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_ARB_CREATE_CONTEXT_PROFILE_REQUIRED, "ARB_create_context_profile required") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_OPENGL_3_2_NOT_SUPPORTED, "OpenGL 3.2 not supported by GL driver (ERROR_INVALID_VERSION_ARB)") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_OPENGL_VERSION_NOT_SUPPORTED, "requested OpenGL version not supported by GL driver (ERROR_INVALID_VERSION_ARB)") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_OPENGL_PROFILE_NOT_SUPPORTED, "requested OpenGL profile not support by GL driver (ERROR_INVALID_PROFILE_ARB)") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_INCOMPATIBLE_DEVICE_CONTEXT, "CreateContextAttribsARB failed with ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB") \
_SAPP_LOGITEM_XMACRO(WIN32_WGL_CREATE_CONTEXT_ATTRIBS_FAILED_OTHER, "CreateContextAttribsARB failed for other reason") \
Expand Down Expand Up @@ -1708,7 +1708,7 @@ typedef struct sapp_desc {
sapp_logger logger; // logging callback override (default: NO LOGGING!)

// backend-specific options
int gl_major_version; // override GL major and minor version (the default GL version is 3.2)
int gl_major_version; // override GL major and minor version (the default GL version is 4.1 on macOS, 4.3 elsewhere)
int gl_minor_version;
bool win32_console_utf8; // if true, set the output console codepage to UTF-8
bool win32_console_create; // if true, attach stdout/stderr to a new console window
Expand Down Expand Up @@ -6890,7 +6890,7 @@ _SOKOL_PRIVATE void _sapp_wgl_create_context(void) {
if (!_sapp.wgl.gl_ctx) {
const DWORD err = GetLastError();
if (err == (0xc0070000 | ERROR_INVALID_VERSION_ARB)) {
_SAPP_PANIC(WIN32_WGL_OPENGL_3_2_NOT_SUPPORTED);
_SAPP_PANIC(WIN32_WGL_OPENGL_VERSION_NOT_SUPPORTED);
}
else if (err == (0xc0070000 | ERROR_INVALID_PROFILE_ARB)) {
_SAPP_PANIC(WIN32_WGL_OPENGL_PROFILE_NOT_SUPPORTED);
Expand Down

0 comments on commit b1221d1

Please sign in to comment.