Skip to content
This repository has been archived by the owner on Apr 28, 2022. It is now read-only.

Commit

Permalink
update MemTransferIOS::fromGPU(…, int index) calls to match new virtu…
Browse files Browse the repository at this point in the history
…al api (#23)
  • Loading branch information
headupinclouds authored Aug 3, 2017
1 parent 8266883 commit 3700f96
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ogles_gpgpu/platform/ios/memtransfer_ios.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ogles_gpgpu/platform/ios/memtransfer_ios.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MemTransferIOS : public MemTransfer, public MemTransferOptimized {
/**
* Map data from GPU to <buf>
*/
virtual void fromGPU(unsigned char* buf);
virtual void fromGPU(unsigned char* buf, int /*index*/);

/**
* Inidcates whether or not this MemTransfer implementation
Expand All @@ -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.
Expand Down

0 comments on commit 3700f96

Please sign in to comment.