summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-11-07 20:03:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 20:03:42 +0000
commit8e624d4cad45532c09879356f3adaa3b65fdcfc9 (patch)
treec370021e1b31722ad6325c23c6bf9afb9850438c /opengl
parentcad831fb15f3c35945cb250d95d31c9b43d65785 (diff)
parent98d20f82ca8979b30c81df9639f54ab11e1951f9 (diff)
downloadframeworks_native-8e624d4cad45532c09879356f3adaa3b65fdcfc9.zip
frameworks_native-8e624d4cad45532c09879356f3adaa3b65fdcfc9.tar.gz
frameworks_native-8e624d4cad45532c09879356f3adaa3b65fdcfc9.tar.bz2
am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9': Add a BufferItem parameter to onFrameAvailable
Diffstat (limited to 'opengl')
-rw-r--r--opengl/tests/EGLTest/EGL_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/tests/EGLTest/EGL_test.cpp b/opengl/tests/EGLTest/EGL_test.cpp
index a4364c6..d69a275 100644
--- a/opengl/tests/EGLTest/EGL_test.cpp
+++ b/opengl/tests/EGLTest/EGL_test.cpp
@@ -101,7 +101,7 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) {
EXPECT_TRUE(eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs));
struct DummyConsumer : public BnConsumerListener {
- virtual void onFrameAvailable() {}
+ virtual void onFrameAvailable(const BufferItem& /* item */) {}
virtual void onBuffersReleased() {}
virtual void onSidebandStreamChanged() {}
};