godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OS_Javascript temporarly uses dummy rasterizer.

Browse Source
This commit is contained in:
Fabio Alessandrelli 2020-03-08 01:52:11 +01:00
parent fd035c931d
commit aa8c825855
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/SCsub
View File

@ -23,7 +23,7 @@ SConscript('coremidi/SCsub')
SConscript('winmidi/SCsub') SConscript('winmidi/SCsub')
# Graphics drivers # Graphics drivers
if (env["platform"] != "server"): if (env["platform"] != "server" and env["platform"] != "javascript"):
# SConscript('gles2/SCsub') # SConscript('gles2/SCsub')
SConscript('vulkan/SCsub') SConscript('vulkan/SCsub')
SConscript('gl_context/SCsub') SConscript('gl_context/SCsub')

6
platform/javascript/os_javascript.cpp
View File

@ -31,7 +31,8 @@
#include "os_javascript.h" #include "os_javascript.h"
#include "core/io/file_access_buffered_fa.h" #include "core/io/file_access_buffered_fa.h"
#include "drivers/gles2/rasterizer_gles2.h" //#include "drivers/gles2/rasterizer_gles2.h"
#include "drivers/dummy/rasterizer_dummy.h"
#include "drivers/unix/dir_access_unix.h" #include "drivers/unix/dir_access_unix.h"
#include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix.h"
#include "main/main.h" #include "main/main.h"
@ -891,6 +892,7 @@ void OS_JavaScript::initialize_core() {
Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
#if 0
EmscriptenWebGLContextAttributes attributes; EmscriptenWebGLContextAttributes attributes;
emscripten_webgl_init_context_attributes(&attributes); emscripten_webgl_init_context_attributes(&attributes);
attributes.alpha = GLOBAL_GET("display/window/per_pixel_transparency/allowed"); attributes.alpha = GLOBAL_GET("display/window/per_pixel_transparency/allowed");
@ -947,6 +949,8 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
} else { } else {
set_window_size(get_window_size()); set_window_size(get_window_size());
} }
#endif
RasterizerDummy::make_current(); // TODO GLES2 in Godot 4.0... or webgpu?
char locale_ptr[16]; char locale_ptr[16];
/* clang-format off */ /* clang-format off */