summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-06-24 13:09:19 -0700
committerDan Stoza <stoza@google.com>2014-06-24 13:09:19 -0700
commite49ba8e2ed8e17156eb00c8fc8e2285df62bc018 (patch)
tree75c16e16f849b08d9f377c75bad708d6510e7388 /libs
parentb410863d6aae1e923ff163942adef01ff6a2ea81 (diff)
downloadframeworks_native-e49ba8e2ed8e17156eb00c8fc8e2285df62bc018.zip
frameworks_native-e49ba8e2ed8e17156eb00c8fc8e2285df62bc018.tar.gz
frameworks_native-e49ba8e2ed8e17156eb00c8fc8e2285df62bc018.tar.bz2
GLConsumer: Stop using default constructor params
Removes the dependency on default constructor parameters for GLConsumer so that a different constructor prototype can safely be added. Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/tests/MultiTextureConsumer_test.cpp3
-rw-r--r--libs/gui/tests/SurfaceTextureClient_test.cpp6
-rw-r--r--libs/gui/tests/SurfaceTextureGL.h3
3 files changed, 8 insertions, 4 deletions
diff --git a/libs/gui/tests/MultiTextureConsumer_test.cpp b/libs/gui/tests/MultiTextureConsumer_test.cpp
index 1eb6ef6..3a25ac5 100644
--- a/libs/gui/tests/MultiTextureConsumer_test.cpp
+++ b/libs/gui/tests/MultiTextureConsumer_test.cpp
@@ -37,7 +37,8 @@ protected:
sp<IGraphicBufferProducer> producer;
sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
- mGlConsumer = new GLConsumer(consumer, TEX_ID);
+ mGlConsumer = new GLConsumer(consumer, TEX_ID,
+ GLConsumer::TEXTURE_EXTERNAL, true, false);
mSurface = new Surface(producer);
mANW = mSurface.get();
diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp
index 7f9fcc4..8cdf3bc 100644
--- a/libs/gui/tests/SurfaceTextureClient_test.cpp
+++ b/libs/gui/tests/SurfaceTextureClient_test.cpp
@@ -46,7 +46,8 @@ protected:
sp<IGraphicBufferProducer> producer;
sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
- mST = new GLConsumer(consumer, 123);
+ mST = new GLConsumer(consumer, 123, GLConsumer::TEXTURE_EXTERNAL, true,
+ false);
mSTC = new Surface(producer);
mANW = mSTC;
@@ -716,7 +717,8 @@ protected:
sp<IGraphicBufferProducer> producer;
sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
- sp<GLConsumer> st(new GLConsumer(consumer, i));
+ sp<GLConsumer> st(new GLConsumer(consumer, i,
+ GLConsumer::TEXTURE_EXTERNAL, true, false));
sp<Surface> stc(new Surface(producer));
mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig,
static_cast<ANativeWindow*>(stc.get()), NULL);
diff --git a/libs/gui/tests/SurfaceTextureGL.h b/libs/gui/tests/SurfaceTextureGL.h
index 3bff192..53eb68c 100644
--- a/libs/gui/tests/SurfaceTextureGL.h
+++ b/libs/gui/tests/SurfaceTextureGL.h
@@ -39,7 +39,8 @@ protected:
GLTest::SetUp();
sp<IGraphicBufferProducer> producer;
BufferQueue::createBufferQueue(&producer, &mConsumer);
- mST = new GLConsumer(mConsumer, TEX_ID);
+ mST = new GLConsumer(mConsumer, TEX_ID, GLConsumer::TEXTURE_EXTERNAL,
+ true, false);
mSTC = new Surface(producer);
mANW = mSTC;
mTextureRenderer = new TextureRenderer(TEX_ID, mST);