godotengine/godot-platform-haiku
1
0
Fork 0
mirror of https://github.com/godotengine/godot-platform-haiku.git synced 2026-02-25 10:36:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete GLES3 backend

Browse Source 
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!
This commit is contained in:
Rémi Verschelde
2020-02-13 10:08:52 +01:00
parent df6fd145a4
commit 72061c8ec9
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
os_haiku.cpp
View File

@@ -28,10 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "drivers/gles3/rasterizer_gles3.h"
#include "os_haiku.h" #include "os_haiku.h"
#include "drivers/gles2/rasterizer_gles2.h"
#include "main/main.h" #include "main/main.h"
#include "servers/physics/physics_server_sw.h" #include "servers/physics/physics_server_sw.h"
#include "servers/visual/visual_server_raster.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 { const char *OS_Haiku::get_video_driver_name(int p_driver) const {
return "GLES3"; return "GLES2";
} }
int OS_Haiku::get_current_video_driver() const { 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->initialize();
context_gl->make_current(); context_gl->make_current();
context_gl->set_use_vsync(current_video_mode.use_vsync); context_gl->set_use_vsync(current_video_mode.use_vsync);
RasterizerGLES3::register_config(); // FIXME: That's not how the rasterizer setup should happen.
RasterizerGLES3::make_current(); RasterizerGLES2::register_config();
RasterizerGLES2::make_current();
#endif #endif
visual_server = memnew(VisualServerRaster); visual_server = memnew(VisualServerRaster);

1
platform_config.h
View File

@@ -33,5 +33,4 @@
// for ifaddrs.h needed in drivers/unix/ip_unix.cpp // for ifaddrs.h needed in drivers/unix/ip_unix.cpp
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1
#define GLES3_INCLUDE_H "thirdparty/glad/glad/glad.h"
#define GLES2_INCLUDE_H "thirdparty/glad/glad/glad.h" #define GLES2_INCLUDE_H "thirdparty/glad/glad/glad.h"