whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasm: Lift restriction on offscreen for fake context sharing 

We only activated our fake context sharing logic for offscreen
surfaces. This commit removed that restriction this allows the
rendercontrol example to run

Fixes: QTBUG-117410
Change-Id: Id86617f57c6a98a920f5dd82332dcd8277f103e4
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
bb10
Even Oscar Andersen 2024-03-11 12:42:47 +01:00
parent 49329ae227
commit 3d46094b68
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/platforms/wasm/qwasmopenglcontext.cpp
View File

@ -58,27 +58,19 @@ QWasmOpenGLContext::obtainEmscriptenContext(QPlatformSurface *surface)
return m_ownedWebGLContext.handle;
if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
if (const auto *shareContext = m_qGlContext->shareContext()) {
// Since there are no resource sharing capabilities with WebGL whatsoever, we use the
// same actual underlaying WebGL context. This is not perfect, but it works in most
// cases.
return static_cast<QWasmOpenGLContext *>(shareContext->handle())
->m_ownedWebGLContext.handle;
} else {
// Reuse the existing context for offscreen drawing, even if it happens to be a canvas
// context. This is because it is impossible to re-home an existing context to the
// new surface and works as an emulation measure.
if (m_ownedWebGLContext.handle)
return m_ownedWebGLContext.handle;
// Reuse the existing context for offscreen drawing, even if it happens to be a canvas
// context. This is because it is impossible to re-home an existing context to the
// new surface and works as an emulation measure.
if (m_ownedWebGLContext.handle)
return m_ownedWebGLContext.handle;
// The non-shared offscreen context is heavily limited on WASM, but we provide it
// anyway for potential pixel readbacks.
m_ownedWebGLContext =
QOpenGLContextData{ .surface = surface,
.handle = createEmscriptenContext(
static_cast<QWasmOffscreenSurface *>(surface)->id(),
m_actualFormat) };
}
// The non-shared offscreen context is heavily limited on WASM, but we provide it
// anyway for potential pixel readbacks.
m_ownedWebGLContext =
QOpenGLContextData{ .surface = surface,
.handle = createEmscriptenContext(
static_cast<QWasmOffscreenSurface *>(surface)->id(),
m_actualFormat) };
} else {
destroyWebGLContext(m_ownedWebGLContext.handle);
@ -160,6 +152,9 @@ GLuint QWasmOpenGLContext::defaultFramebufferObject(QPlatformSurface *surface) c
bool QWasmOpenGLContext::makeCurrent(QPlatformSurface *surface)
{
if (auto *shareContext = m_qGlContext->shareContext())
return shareContext->makeCurrent(surface->surface());
const auto context = obtainEmscriptenContext(surface);
if (!context)
return false;