diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /src/core/chromium_gpu_helper.cpp | |
parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/chromium_gpu_helper.cpp')
-rw-r--r-- | src/core/chromium_gpu_helper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/chromium_gpu_helper.cpp b/src/core/chromium_gpu_helper.cpp index 483f68aac..73a4da70f 100644 --- a/src/core/chromium_gpu_helper.cpp +++ b/src/core/chromium_gpu_helper.cpp @@ -69,25 +69,25 @@ gpu::SyncPointManager *sync_point_manager() return gpuChannelManager->sync_point_manager(); } -gpu::gles2::MailboxManager *mailbox_manager() +gpu::MailboxManager *mailbox_manager() { gpu::GpuChannelManager *gpuChannelManager = content::GpuChildThread::instance()->gpu_channel_manager(); return gpuChannelManager->mailbox_manager(); } -gpu::gles2::TextureBase* ConsumeTexture(gpu::gles2::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox) +gpu::TextureBase* ConsumeTexture(gpu::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox) { Q_UNUSED(target); return mailboxManager->ConsumeTexture(mailbox); } -unsigned int service_id(gpu::gles2::TextureBase *tex) +unsigned int service_id(gpu::TextureBase *tex) { return tex->service_id(); } #ifdef Q_OS_QNX -EGLStreamData eglstream_connect_consumer(gpu::gles2::Texture *tex) +EGLStreamData eglstream_connect_consumer(gpu::Texture *tex) { EGLStreamData egl_stream; content::StreamTexture* image = static_cast<content::StreamTexture *>(tex->GetLevelImage(GL_TEXTURE_EXTERNAL_OES, 0)); |