From 3700f967acbf594df64f733ebf000ba295976dc5 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Thu, 3 Aug 2017 17:35:48 -0400 Subject: [PATCH] =?UTF-8?q?update=20MemTransferIOS::fromGPU(=E2=80=A6,=20i?= =?UTF-8?q?nt=20index)=20calls=20to=20match=20new=20virtual=20api=20(#23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ogles_gpgpu/platform/ios/memtransfer_ios.cpp | 4 ++-- ogles_gpgpu/platform/ios/memtransfer_ios.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ogles_gpgpu/platform/ios/memtransfer_ios.cpp b/ogles_gpgpu/platform/ios/memtransfer_ios.cpp index 3c0b4a4..df3d6b9 100644 --- a/ogles_gpgpu/platform/ios/memtransfer_ios.cpp +++ b/ogles_gpgpu/platform/ios/memtransfer_ios.cpp @@ -428,7 +428,7 @@ void MemTransferIOS::toGPU(const unsigned char* buf) { glBindTexture(GL_TEXTURE_2D, inputTexId); } -void MemTransferIOS::fromGPU(unsigned char* buf) { +void MemTransferIOS::fromGPU(unsigned char* buf, int /*index*/) { assert(preparedOutput && outputPixelBuffer && outputTexId > 0 && buf); // bind the texture @@ -439,7 +439,7 @@ void MemTransferIOS::fromGPU(unsigned char* buf) { unlockBuffer(BUF_TYPE_OUTPUT); } -void MemTransferIOS::fromGPU(FrameDelegate& delegate) { +void MemTransferIOS::fromGPU(const FrameDelegate& delegate, int /*index*/) { // bind the texture glBindTexture(GL_TEXTURE_2D, outputTexId); diff --git a/ogles_gpgpu/platform/ios/memtransfer_ios.h b/ogles_gpgpu/platform/ios/memtransfer_ios.h index baaee92..f8433d7 100644 --- a/ogles_gpgpu/platform/ios/memtransfer_ios.h +++ b/ogles_gpgpu/platform/ios/memtransfer_ios.h @@ -89,7 +89,7 @@ class MemTransferIOS : public MemTransfer, public MemTransferOptimized { /** * Map data from GPU to */ - virtual void fromGPU(unsigned char* buf); + virtual void fromGPU(unsigned char* buf, int /*index*/); /** * Inidcates whether or not this MemTransfer implementation @@ -102,7 +102,7 @@ class MemTransferIOS : public MemTransfer, public MemTransferOptimized { /** * Apply callback to FBO texture. */ - virtual void fromGPU(FrameDelegate& delegate); + virtual void fromGPU(const FrameDelegate& delegate, int /*index*/); /** * Get bytes per row in underlying FBO.