summaryrefslogtreecommitdiffstats
path: root/opengl/tests/EGLTest/EGL_test.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-07-20 01:02:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-20 01:02:47 +0000
commitbdce8170479d0efb548514c1a290e1bfea711cfd (patch)
tree7cd97ee1e8d8842e3d229a531975f43f4502c75e /opengl/tests/EGLTest/EGL_test.cpp
parente5bb2a45e0861c7ed953373f86afe44f255f021c (diff)
parent26a6f37cc06b8014edcedbee8d5558ca7da9abe3 (diff)
downloadframeworks_native-bdce8170479d0efb548514c1a290e1bfea711cfd.zip
frameworks_native-bdce8170479d0efb548514c1a290e1bfea711cfd.tar.gz
frameworks_native-bdce8170479d0efb548514c1a290e1bfea711cfd.tar.bz2
Merge changes Ic45929f3,Ic63f4f96,I1e703d36,I691f9507
* changes: make sure to reset the framenumber when a buffer is marked FREE Make ANW.setSwapInterval(0) work again BuffferQueue disconnect is now always asynchrnous BufferQueue improvements and APIs changes
Diffstat (limited to 'opengl/tests/EGLTest/EGL_test.cpp')
-rw-r--r--opengl/tests/EGLTest/EGL_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/opengl/tests/EGLTest/EGL_test.cpp b/opengl/tests/EGLTest/EGL_test.cpp
index c0daba2..86bbb84 100644
--- a/opengl/tests/EGLTest/EGL_test.cpp
+++ b/opengl/tests/EGLTest/EGL_test.cpp
@@ -20,7 +20,6 @@
#include <EGL/egl.h>
#include <gui/Surface.h>
-#include <gui/DummyConsumer.h>
namespace android {
@@ -101,9 +100,14 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) {
};
EXPECT_TRUE(eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs));
+ struct DummyConsumer : public BufferQueue::ConsumerListener {
+ virtual void onFrameAvailable() {}
+ virtual void onBuffersReleased() {}
+ };
+
// Create a EGLSurface
sp<BufferQueue> bq = new BufferQueue();
- bq->consumerConnect(new DummyConsumer());
+ bq->consumerConnect(new DummyConsumer, false);
sp<Surface> mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( bq));
sp<ANativeWindow> mANW = mSTC;