diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 10:08:52 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 10:36:44 +0100 |
| commit | 386968ea97d4ceeb004cc05a7aa740aa7abe6ca9 (patch) | |
| tree | 4ad2333ba23b1cbe7db9e213e9d7702606ea42a6 /platform/haiku | |
| parent | d661ca53575142582254f56afd5f92563db6dd9f (diff) | |
Remove obsolete GLES3 backend
Due to the port to Vulkan and complete redesign of the rendering backend,
the `drivers/gles3` code is no longer usable in this state and is not
planned to be ported to the new architecture.
The GLES2 backend is kept (while still disabled and non-working) as it
will eventually be ported to serve as the low-end renderer for Godot 4.0.
Some GLES3 features might be selectively ported to the updated GLES2
backend if there's a need for them, and extensions we can use for that.
So long, OpenGL driver bugs!
Diffstat (limited to 'platform/haiku')
| -rw-r--r-- | platform/haiku/os_haiku.cpp | 11 | ||||
| -rw-r--r-- | platform/haiku/platform_config.h | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 80ab9c6aa1..2e4bb2ff26 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -28,10 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "drivers/gles3/rasterizer_gles3.h" - #include "os_haiku.h" +#include "drivers/gles2/rasterizer_gles2.h" #include "main/main.h" #include "servers/physics/physics_server_sw.h" #include "servers/visual/visual_server_raster.h" @@ -78,7 +77,7 @@ int OS_Haiku::get_video_driver_count() const { } const char *OS_Haiku::get_video_driver_name(int p_driver) const { - return "GLES3"; + return "GLES2"; } int OS_Haiku::get_current_video_driver() const { @@ -112,9 +111,9 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p context_gl->initialize(); context_gl->make_current(); context_gl->set_use_vsync(current_video_mode.use_vsync); - RasterizerGLES3::register_config(); - RasterizerGLES3::make_current(); - + // FIXME: That's not how the rasterizer setup should happen. + RasterizerGLES2::register_config(); + RasterizerGLES2::make_current(); #endif visual_server = memnew(VisualServerRaster); diff --git a/platform/haiku/platform_config.h b/platform/haiku/platform_config.h index 2df3c05f36..f2d5418adf 100644 --- a/platform/haiku/platform_config.h +++ b/platform/haiku/platform_config.h @@ -33,5 +33,4 @@ // for ifaddrs.h needed in drivers/unix/ip_unix.cpp #define _BSD_SOURCE 1 -#define GLES3_INCLUDE_H "thirdparty/glad/glad/glad.h" #define GLES2_INCLUDE_H "thirdparty/glad/glad/glad.h" |