diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-12-12 12:44:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-12 12:44:29 -0800 |
| commit | 189b270ae495859b86fe084e9269403faffe8bca (patch) | |
| tree | c5e1ec8c7e091103bb302d6131f9ceb7b8ab4ce0 | |
| parent | 603b6c197582508a66ddebd303cf0b8c3ed937b4 (diff) | |
| parent | c911ea531830b9dd5d25cf6f0c03f2f93908c4d1 (diff) | |
| download | frameworks_native-189b270ae495859b86fe084e9269403faffe8bca.zip frameworks_native-189b270ae495859b86fe084e9269403faffe8bca.tar.gz frameworks_native-189b270ae495859b86fe084e9269403faffe8bca.tar.bz2 | |
Merge "stop using a deprecated SurfaceTextureClient ctor"
| -rw-r--r-- | libs/gui/tests/SurfaceTextureClient_test.cpp | 4 | ||||
| -rw-r--r-- | libs/gui/tests/SurfaceTexture_test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index ec14a0d..baeca06 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -41,7 +41,7 @@ protected: testInfo->name()); mST = new SurfaceTexture(123); - mSTC = new SurfaceTextureClient(mST); + mSTC = new SurfaceTextureClient(mST->getBufferQueue()); mANW = mSTC; // We need a valid GL context so we can test updateTexImage() @@ -686,7 +686,7 @@ protected: for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) { sp<SurfaceTexture> st(new SurfaceTexture(i)); - sp<SurfaceTextureClient> stc(new SurfaceTextureClient(st)); + sp<SurfaceTextureClient> stc(new SurfaceTextureClient(st->getBufferQueue())); mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig, static_cast<ANativeWindow*>(stc.get()), NULL); ASSERT_EQ(EGL_SUCCESS, eglGetError()); diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index d9b40cf..58976ad 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -385,7 +385,7 @@ protected: virtual void SetUp() { GLTest::SetUp(); mST = new SurfaceTexture(TEX_ID); - mSTC = new SurfaceTextureClient(mST); + mSTC = new SurfaceTextureClient(mST->getBufferQueue()); mANW = mSTC; mTextureRenderer = new TextureRenderer(TEX_ID, mST); ASSERT_NO_FATAL_FAILURE(mTextureRenderer->SetUp()); |