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

Merge pull request #17343 from eska014/wasm-webgl1 

Reinstate WebGL 1.0 (GLES2) driver in HTML5 platform
This commit is contained in:
Rémi Verschelde 2018-03-07 22:38:58 +01:00 committed by GitHub
parent 900384a622 802b6d3669
commit acacba3fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/os.h
View File

@ -46,7 +46,8 @@
enum VideoDriver { enum VideoDriver {
VIDEO_DRIVER_GLES3, VIDEO_DRIVER_GLES3,
VIDEO_DRIVER_GLES2 VIDEO_DRIVER_GLES2,
VIDEO_DRIVER_MAX,
}; };
class OS { class OS {

29
platform/javascript/os_javascript.cpp
View File

@ -33,6 +33,7 @@
#include "core/engine.h" #include "core/engine.h"
#include "core/io/file_access_buffered_fa.h" #include "core/io/file_access_buffered_fa.h"
#include "dom_keys.h" #include "dom_keys.h"
#include "drivers/gles2/rasterizer_gles2.h"
#include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/rasterizer_gles3.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"
@ -57,12 +58,19 @@ static void dom2godot_mod(T emscripten_event_ptr, Ref<InputEventWithModifiers> g
int OS_JavaScript::get_video_driver_count() const { int OS_JavaScript::get_video_driver_count() const {
return 1; return VIDEO_DRIVER_MAX;
} }
const char *OS_JavaScript::get_video_driver_name(int p_driver) const { const char *OS_JavaScript::get_video_driver_name(int p_driver) const {
return "GLES3"; switch (p_driver) {
case VIDEO_DRIVER_GLES3:
return "GLES3";
case VIDEO_DRIVER_GLES2:
return "GLES2";
}
ERR_EXPLAIN("Invalid video driver index " + itos(p_driver));
ERR_FAIL_V(NULL);
} }
int OS_JavaScript::get_audio_driver_count() const { int OS_JavaScript::get_audio_driver_count() const {
@ -422,7 +430,19 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
emscripten_webgl_init_context_attributes(&attributes); emscripten_webgl_init_context_attributes(&attributes);
attributes.alpha = false; attributes.alpha = false;
attributes.antialias = false; attributes.antialias = false;
attributes.majorVersion = 2; ERR_FAIL_INDEX_V(p_video_driver, VIDEO_DRIVER_MAX, ERR_INVALID_PARAMETER);
switch (p_video_driver) {
case VIDEO_DRIVER_GLES3:
attributes.majorVersion = 2;
RasterizerGLES3::register_config();
RasterizerGLES3::make_current();
break;
case VIDEO_DRIVER_GLES2:
attributes.majorVersion = 1;
RasterizerGLES2::register_config();
RasterizerGLES2::make_current();
break;
}
EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx = emscripten_webgl_create_context(NULL, &attributes); EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx = emscripten_webgl_create_context(NULL, &attributes);
ERR_FAIL_COND_V(emscripten_webgl_make_context_current(ctx) != EMSCRIPTEN_RESULT_SUCCESS, ERR_UNAVAILABLE); ERR_FAIL_COND_V(emscripten_webgl_make_context_current(ctx) != EMSCRIPTEN_RESULT_SUCCESS, ERR_UNAVAILABLE);
@ -449,9 +469,6 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
RasterizerGLES3::register_config();
RasterizerGLES3::make_current();
print_line("Init VS"); print_line("Init VS");
visual_server = memnew(VisualServerRaster()); visual_server = memnew(VisualServerRaster());