debugging

This commit is contained in:
2025-03-21 00:50:55 +03:00
parent cafe9ba094
commit 04e75ebd81

View File

@@ -1,4 +1,4 @@
From 90538724b93b51d6ecfda2de5aa3ff9e6dda6d70 Mon Sep 17 00:00:00 2001 From e0d2f1123b26dad9a2dd006c7b81e44986b7bb80 Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com> From: Sergey Lapin <slapinid@gmail.com>
Date: Thu, 20 Mar 2025 21:49:14 +0300 Date: Thu, 20 Mar 2025 21:49:14 +0300
Subject: [PATCH] Made GLES work on X11 Subject: [PATCH] Made GLES work on X11
@@ -7,7 +7,7 @@ Subject: [PATCH] Made GLES work on X11
core/SCsub | 2 +- core/SCsub | 2 +-
.../gles2/rasterizer_canvas_base_gles2.cpp | 3 + .../gles2/rasterizer_canvas_base_gles2.cpp | 3 +
drivers/gles2/rasterizer_gles2.cpp | 10 + drivers/gles2/rasterizer_gles2.cpp | 10 +
drivers/gles2/rasterizer_storage_gles2.cpp | 3 + drivers/gles2/rasterizer_storage_gles2.cpp | 6 +
drivers/gles2/shader_gles2.cpp | 6 +- drivers/gles2/shader_gles2.cpp | 6 +-
modules/denoise/config.py | 2 +- modules/denoise/config.py | 2 +-
modules/gdnative/nativescript/SCsub | 2 +- modules/gdnative/nativescript/SCsub | 2 +-
@@ -38,7 +38,7 @@ Subject: [PATCH] Made GLES work on X11
platform/x11es/platform_x11_builders.py | 18 + platform/x11es/platform_x11_builders.py | 18 +
platform/x11es/power_x11.cpp | 571 +++ platform/x11es/power_x11.cpp | 571 +++
platform/x11es/power_x11.h | 65 + platform/x11es/power_x11.h | 65 +
34 files changed, 11003 insertions(+), 11 deletions(-) 34 files changed, 11006 insertions(+), 11 deletions(-)
create mode 100644 platform/x11es/SCsub create mode 100644 platform/x11es/SCsub
create mode 100644 platform/x11es/context_gl_x11.cpp create mode 100644 platform/x11es/context_gl_x11.cpp
create mode 100644 platform/x11es/context_gl_x11.h create mode 100644 platform/x11es/context_gl_x11.h
@@ -122,10 +122,18 @@ index c8eb0c7509..cbd11af2de 100644
if (callback) { if (callback) {
print_line("godot: ENABLING GL DEBUG"); print_line("godot: ENABLING GL DEBUG");
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp
index 497d8d991f..5427df69d8 100644 index 497d8d991f..404ed0016b 100644
--- a/drivers/gles2/rasterizer_storage_gles2.cpp --- a/drivers/gles2/rasterizer_storage_gles2.cpp
+++ b/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp
@@ -89,7 +89,10 @@ GLuint RasterizerStorageGLES2::system_fbo = 0; @@ -28,6 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
+#include <cassert>
#include "rasterizer_storage_gles2.h"
#include "core/math/transform.h"
@@ -89,7 +90,10 @@ GLuint RasterizerStorageGLES2::system_fbo = 0;
#define _DEPTH_COMPONENT24_OES 0x81A6 #define _DEPTH_COMPONENT24_OES 0x81A6
#ifndef GLES_OVER_GL #ifndef GLES_OVER_GL
@@ -136,6 +144,15 @@ index 497d8d991f..5427df69d8 100644
// enable extensions manually for android and ios // enable extensions manually for android and ios
#ifndef UWP_ENABLED #ifndef UWP_ENABLED
@@ -6522,6 +6526,8 @@ void RasterizerStorageGLES2::initialize() {
glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &config.max_vertex_texture_image_units);
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &config.max_texture_size);
+ print_verbose("max texture size: " + itos(config.max_texture_size));
+ assert(config.max_texture_size > 0);
glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &config.max_cubemap_texture_size);
glGetIntegerv(GL_MAX_VIEWPORT_DIMS, config.max_viewport_dimensions);
diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp
index c3a537585e..b281852add 100644 index c3a537585e..b281852add 100644
--- a/drivers/gles2/shader_gles2.cpp --- a/drivers/gles2/shader_gles2.cpp