diff options
| author | Dan Stoza <stoza@google.com> | 2014-11-07 20:09:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 20:09:39 +0000 |
| commit | 6b7a45859e165dcc33a31540a0ead4b63d6ade82 (patch) | |
| tree | 0203488b3262c221c07ed711b0c950ccbad08214 /opengl | |
| parent | e1cd7966d23289341f17988e5f90ae2056a07b66 (diff) | |
| parent | 8e624d4cad45532c09879356f3adaa3b65fdcfc9 (diff) | |
| download | frameworks_native-6b7a45859e165dcc33a31540a0ead4b63d6ade82.zip frameworks_native-6b7a45859e165dcc33a31540a0ead4b63d6ade82.tar.gz frameworks_native-6b7a45859e165dcc33a31540a0ead4b63d6ade82.tar.bz2 | |
am 8e624d4c: am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
Add a BufferItem parameter to onFrameAvailable
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/EGLTest/EGL_test.cpp | 2 |
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() {} }; |