Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-20 22:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Emscripten function calls.

Browse Source
This commit is contained in:
Бранимир Караџић
2020-06-19 09:31:32 -07:00
parent a24274738e
commit 3f6d049470
6 changed files with 112 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/glcontext_html5.cpp
View File

@@ -10,8 +10,7 @@
# if BGFX_USE_HTML5
#include <emscripten/emscripten.h>
#include <emscripten/html5.h>
# include "emscripten.h"
// from emscripten gl.c, because we're not going to go
// through egl
@@ -45,13 +44,13 @@ namespace bgfx { namespace gl
~SwapChainGL()
{
emscripten_webgl_destroy_context(m_context);
EMSCRIPTEN_CHECK(emscripten_webgl_destroy_context(m_context) );
BX_FREE(g_allocator, m_canvas);
}
void makeCurrent()
{
BX_ASSERT(emscripten_webgl_make_context_current(m_context) == EMSCRIPTEN_RESULT_SUCCESS, "emscripten_webgl_make_context_current() failed!");
EMSCRIPTEN_CHECK(emscripten_webgl_make_context_current(m_context) );
}
void swapBuffers()
@@ -74,8 +73,11 @@ namespace bgfx { namespace gl
m_primary = createSwapChain((void*)canvas);
if (_width && _height)
BX_ASSERT(emscripten_set_canvas_element_size(canvas, (int)_width, (int)_height) == EMSCRIPTEN_RESULT_SUCCESS, "emscripten_set_canvas_element_size() failed in GlContext::create()!");
if (0 != _width
&& 0 != _height)
{
EMSCRIPTEN_CHECK(emscripten_set_canvas_element_size(canvas, (int)_width, (int)_height) );
}
makeCurrent(m_primary);
}
@@ -101,7 +103,7 @@ namespace bgfx { namespace gl
return;
}
BX_ASSERT(emscripten_set_canvas_element_size(m_primary->m_canvas, (int) _width, (int) _height) == EMSCRIPTEN_RESULT_SUCCESS, "emscripten_set_canvas_element_size() failed in GlContext::resize()!");
EMSCRIPTEN_CHECK(emscripten_set_canvas_element_size(m_primary->m_canvas, (int) _width, (int) _height) );
}
SwapChainGL* GlContext::createSwapChain(void* _nwh)
@@ -125,9 +127,10 @@ namespace bgfx { namespace gl
{
s_attrs.majorVersion = version;
EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context = emscripten_webgl_create_context(canvas, &s_attrs);
if (context > 0)
{
BX_ASSERT(emscripten_webgl_make_context_current(context) == EMSCRIPTEN_RESULT_SUCCESS, "emscripten_webgl_make_context_current() failed in GlContext::createSwapChain()!");
EMSCRIPTEN_CHECK(emscripten_webgl_make_context_current(context) );
SwapChainGL* swapChain = BX_NEW(g_allocator, SwapChainGL)(context, canvas);
@@ -137,7 +140,8 @@ namespace bgfx { namespace gl
}
error = (int) context;
}
BX_TRACE("Failed to create WebGL context. (Canvas handle: '%s', last attempt error %d)", canvas, error);
BX_TRACE("Failed to create WebGL context. (Canvas handle: '%s', last attempt error %d)", canvas, error);
return NULL;
}