diff --git a/filament/src/driver/opengl/ContextManagerCocoa.h b/filament/src/driver/opengl/ContextManagerCocoa.h index a28bc17fc8..5703de2884 100644 --- a/filament/src/driver/opengl/ContextManagerCocoa.h +++ b/filament/src/driver/opengl/ContextManagerCocoa.h @@ -45,6 +45,8 @@ public: return driver::FenceStatus::ERROR; } + void setPresentationTime(long time) noexcept final override {} + Stream* createStream(void* nativeStream) noexcept final { return nullptr; } void destroyStream(Stream* stream) noexcept final {} void attach(Stream* stream, intptr_t tname) noexcept final {} diff --git a/filament/src/driver/opengl/ContextManagerEGL.cpp b/filament/src/driver/opengl/ContextManagerEGL.cpp index 4e93203c5d..40d422e1b5 100644 --- a/filament/src/driver/opengl/ContextManagerEGL.cpp +++ b/filament/src/driver/opengl/ContextManagerEGL.cpp @@ -537,6 +537,7 @@ std::unique_ptr ContextManagerEGL::createDriver(void* const sharedGLCont EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 0, // reserved to set ALPHA_SIZE below + EGL_RECORDABLE_ANDROID, 1, EGL_NONE }; diff --git a/filament/src/driver/opengl/ContextManagerGLX.cpp b/filament/src/driver/opengl/ContextManagerGLX.cpp index 08a7347526..df91078485 100644 --- a/filament/src/driver/opengl/ContextManagerGLX.cpp +++ b/filament/src/driver/opengl/ContextManagerGLX.cpp @@ -179,9 +179,6 @@ void ContextManagerGLX::commit(ExternalContext::SwapChain* swapChain) noexcept { g_glx.swapBuffers(mGLXDisplay, (GLXDrawable)swapChain); } -void ContextManagerGLX::setPresentationTime(long time) noexcept { -} - //TODO Implement GLX fences ExternalContext::Fence* ContextManagerGLX::createFence() noexcept { Fence* f = new Fence(); diff --git a/filament/src/driver/opengl/ContextManagerGLX.h b/filament/src/driver/opengl/ContextManagerGLX.h index 3949d81bc2..efa97b7ade 100644 --- a/filament/src/driver/opengl/ContextManagerGLX.h +++ b/filament/src/driver/opengl/ContextManagerGLX.h @@ -43,7 +43,7 @@ public: void destroyFence(Fence* fence) noexcept override; driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept override; - void setPresentationTime(long time) noexcept override; + void setPresentationTime(long time) noexcept final override {} Stream* createStream(void* nativeStream) noexcept final override { return nullptr; } void destroyStream(Stream* stream) noexcept final override {} diff --git a/filament/src/driver/opengl/ContextManagerWGL.cpp b/filament/src/driver/opengl/ContextManagerWGL.cpp index 2a254d5052..9ff5a3e819 100644 --- a/filament/src/driver/opengl/ContextManagerWGL.cpp +++ b/filament/src/driver/opengl/ContextManagerWGL.cpp @@ -192,9 +192,6 @@ void ContextManagerWGL::commit(ExternalContext::SwapChain* swapChain) noexcept { } } -void ContextManagerWGL::setPresentationTime(long time) noexcept { -} - //TODO Implement WGL fences ExternalContext::Fence* ContextManagerWGL::createFence() noexcept { return nullptr; diff --git a/filament/src/driver/opengl/ContextManagerWGL.h b/filament/src/driver/opengl/ContextManagerWGL.h index 9ce5247bcc..cb3079f01a 100644 --- a/filament/src/driver/opengl/ContextManagerWGL.h +++ b/filament/src/driver/opengl/ContextManagerWGL.h @@ -37,12 +37,12 @@ public: void makeCurrent(SwapChain* swapChain) noexcept override; void commit(SwapChain* swapChain) noexcept override; - void setPresentationTime(long time) noexcept override; - Fence* createFence() noexcept override; void destroyFence(Fence* fence) noexcept override; driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept override; + void setPresentationTime(long time) noexcept final override {} + Stream* createStream(void* nativeStream) noexcept final override { return nullptr; } void destroyStream(Stream* stream) noexcept final override {} void attach(Stream* stream, intptr_t tname) noexcept final override {} diff --git a/filament/src/driver/opengl/ContextManagerWebGL.h b/filament/src/driver/opengl/ContextManagerWebGL.h index b053676469..da69a60cbf 100644 --- a/filament/src/driver/opengl/ContextManagerWebGL.h +++ b/filament/src/driver/opengl/ContextManagerWebGL.h @@ -42,6 +42,8 @@ public: void destroyFence(Fence* fence) noexcept final override; driver::FenceStatus waitFence(Fence* fence, uint64_t timeout) noexcept final override; + void setPresentationTime(long time) noexcept final override {} + Stream* createStream(void* nativeStream) noexcept final override { return nullptr; } void destroyStream(Stream* stream) noexcept final override {} void attach(Stream* stream, intptr_t tname) noexcept final override {}