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

Merge pull request #47659 from Faless/js/3.x_webgl_fallback 

[3.x] [HTML5] Implement WebGL fallback.
This commit is contained in:
Rémi Verschelde 2021-04-06 13:06:19 +02:00 committed by GitHub
parent ea5b3dda93 00f3807a24
commit e97cd3d52d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/javascript/godot_js.h
View File

@ -71,6 +71,7 @@ extern int godot_js_display_fullscreen_exit();
extern void godot_js_display_compute_position(int p_x, int p_y, int32_t *r_x, int32_t *r_y); extern void godot_js_display_compute_position(int p_x, int p_y, int32_t *r_x, int32_t *r_y);
extern void godot_js_display_window_title_set(const char *p_text); extern void godot_js_display_window_title_set(const char *p_text);
extern void godot_js_display_window_icon_set(const uint8_t *p_ptr, int p_len); extern void godot_js_display_window_icon_set(const uint8_t *p_ptr, int p_len);
extern int godot_js_display_has_webgl(int p_version);
// Display clipboard // Display clipboard
extern int godot_js_display_clipboard_set(const char *p_text); extern int godot_js_display_clipboard_set(const char *p_text);

11
platform/javascript/js/libs/library_godot_display.js
View File

@ -719,6 +719,17 @@ const GodotDisplay = {
GodotRuntime.setHeapValue(r_y, (y - rect.y) * rh, 'i32'); GodotRuntime.setHeapValue(r_y, (y - rect.y) * rh, 'i32');
}, },
godot_js_display_has_webgl__sig: 'ii',
godot_js_display_has_webgl: function (p_version) {
if (p_version !== 1 && p_version !== 2) {
return false;
}
try {
return !!document.createElement('canvas').getContext(p_version === 2 ? 'webgl2' : 'webgl');
} catch (e) { /* Not available */ }
return false;
},
/* /*
* Canvas * Canvas
*/ */

4
platform/javascript/os_javascript.cpp
View File

@ -811,7 +811,7 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
while (true) { while (true) {
if (gles3) { if (gles3) {
if (RasterizerGLES3::is_viable() == OK) { if (godot_js_display_has_webgl(2) && RasterizerGLES3::is_viable() == OK) {
attributes.majorVersion = 2; attributes.majorVersion = 2;
RasterizerGLES3::register_config(); RasterizerGLES3::register_config();
RasterizerGLES3::make_current(); RasterizerGLES3::make_current();
@ -827,7 +827,7 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
} }
} }
} else { } else {
if (RasterizerGLES2::is_viable() == OK) { if (godot_js_display_has_webgl(1) && RasterizerGLES2::is_viable() == OK) {
attributes.majorVersion = 1; attributes.majorVersion = 1;
RasterizerGLES2::register_config(); RasterizerGLES2::register_config();
RasterizerGLES2::make_current(); RasterizerGLES2::make_current();