Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3

Browse source 
- Use lowercase driver names for the `--rendering-driver`
  command line argument.
This commit is contained in:
Hugo Locurcio 2021-09-27 01:07:10 +02:00
parent e3491a3744
commit ce97ddbcb1
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
98 changed files with 4344 additions and 12432 deletions
Download patch file Download diff file Expand all files Collapse all files

18
platform/linuxbsd/gl_manager_x11.cpp
View file

@ -31,7 +31,7 @@
#include "gl_manager_x11.h"
#ifdef X11_ENABLED
#if defined(GLES_X11_ENABLED)
#if defined(OPENGL_ENABLED)
#include <stdio.h>
#include <stdlib.h>
@ -174,9 +174,19 @@ Error GLManager_X11::_create_context(GLDisplay &gl_display) {
int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&ctxErrorHandler);
switch (context_type) {
case GLES_2_0_COMPATIBLE: {
gl_display.context->glx_context = glXCreateNewContext(gl_display.x11_display, fbconfig, GLX_RGBA_TYPE, 0, true);
ERR_FAIL_COND_V(!gl_display.context->glx_context, ERR_UNCONFIGURED);
case GLES_3_0_COMPATIBLE: {
// FIXME: Use `GLX_CONTEXT_CORE_PROFILE_BIT_ARB` instead of compatibility profile
// once deprecated API usages are fixed.
static int context_attribs[] = {
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 3,
GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB /*|GLX_CONTEXT_DEBUG_BIT_ARB*/,
None
};
gl_display.context->glx_context = glXCreateContextAttribsARB(x11_display, fbconfig, nullptr, true, context_attribs);
ERR_FAIL_COND_V(ctxErrorOccurred || !gl_display.context->glx_context, ERR_UNCONFIGURED);
} break;
}