History

Migrate composition of the overlay and pointer to the present thread

Brad Davis committed 10 years ago

Commit 28103cf1 parent dfe057559 files · +1870 −1732Browse files

Showing the changes to interface/src/PluginContainerProxy.cpp (1 of 59 files). Show all

Unified · Split

interface/src/PluginContainerProxy.cpp+2−2
@@ -170,7 +170,7 @@ bool PluginContainerProxy::makeRenderingContextCurrent() { · 169 unmodified lines
170 return qApp->_offscreenContext->makeCurrent();170 return qApp->_offscreenContext->makeCurrent();
171}171}
172 172
173void PluginContainerProxy::releaseSceneTexture(uint32_t texture) {173void PluginContainerProxy::releaseSceneTexture(const gpu::TexturePointer& texture) {
174 Q_ASSERT(QThread::currentThread() == qApp->thread());174 Q_ASSERT(QThread::currentThread() == qApp->thread());
175 auto& framebufferMap = qApp->_lockedFramebufferMap;175 auto& framebufferMap = qApp->_lockedFramebufferMap;
176 Q_ASSERT(framebufferMap.contains(texture));176 Q_ASSERT(framebufferMap.contains(texture));
@@ -180,7 +180,7 @@ void PluginContainerProxy::releaseSceneTexture(uint32_t texture) { · 3 unmodified lines
180 framebufferCache->releaseFramebuffer(framebufferPointer);180 framebufferCache->releaseFramebuffer(framebufferPointer);
181}181}
182 182
183void PluginContainerProxy::releaseOverlayTexture(uint32_t texture) {183void PluginContainerProxy::releaseOverlayTexture(const gpu::TexturePointer& texture) {
184 // FIXME implement present thread compositing184 // FIXME implement present thread compositing
185}185}
186 186