Fix embree build problems with x11es and aarch64
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
From a0005e38a1707de072fbf013dfc14118e2e22e32 Mon Sep 17 00:00:00 2001
|
From 11edf7c743f418fdd937afc5b79565b8951dc671 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
|
||||||
@@ -8,6 +8,7 @@ Subject: [PATCH] Made GLES work on X11
|
|||||||
.../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 | 3 +
|
||||||
|
modules/raycast/SCsub | 2 +-
|
||||||
platform/x11es/SCsub | 27 +
|
platform/x11es/SCsub | 27 +
|
||||||
platform/x11es/context_gl_x11.cpp | 306 ++
|
platform/x11es/context_gl_x11.cpp | 306 ++
|
||||||
platform/x11es/context_gl_x11.h | 89 +
|
platform/x11es/context_gl_x11.h | 89 +
|
||||||
@@ -30,7 +31,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 +
|
||||||
26 files changed, 10991 insertions(+), 1 deletion(-)
|
27 files changed, 10992 insertions(+), 2 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
|
||||||
@@ -128,6 +129,19 @@ index 497d8d991f..5427df69d8 100644
|
|||||||
|
|
||||||
// enable extensions manually for android and ios
|
// enable extensions manually for android and ios
|
||||||
#ifndef UWP_ENABLED
|
#ifndef UWP_ENABLED
|
||||||
|
diff --git a/modules/raycast/SCsub b/modules/raycast/SCsub
|
||||||
|
index dcade4b520..89a2cfa7b2 100644
|
||||||
|
--- a/modules/raycast/SCsub
|
||||||
|
+++ b/modules/raycast/SCsub
|
||||||
|
@@ -90,7 +90,7 @@ if env["builtin_embree"]:
|
||||||
|
|
||||||
|
if not env.msvc:
|
||||||
|
# Flags synced with upstream gnu.cmake.
|
||||||
|
- if env["arch"] == "arm64" and env["platform"] == "x11" and not env["use_llvm"]:
|
||||||
|
+ if env["arch"] == "arm64" and env["platform"] in ["x11", "x11es"] and not env["use_llvm"]:
|
||||||
|
env_thirdparty.Append(CXXFLAGS=["-flax-vector-conversions"])
|
||||||
|
|
||||||
|
env_thirdparty.Append(
|
||||||
diff --git a/platform/x11es/SCsub b/platform/x11es/SCsub
|
diff --git a/platform/x11es/SCsub b/platform/x11es/SCsub
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000..3777596c80
|
index 0000000000..3777596c80
|
||||||
|
|||||||
Reference in New Issue
Block a user