summaryrefslogtreecommitdiffstats
path: root/include/gui
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 /include/gui
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 'include/gui')
-rw-r--r--include/gui/GLConsumer.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/gui/GLConsumer.h b/include/gui/GLConsumer.h
index a5fdfb9..787b3d4 100644
--- a/include/gui/GLConsumer.h
+++ b/include/gui/GLConsumer.h
@@ -52,9 +52,8 @@ class String8;
* This class was previously called SurfaceTexture.
*/
class GLConsumer : public ConsumerBase {
-protected:
- enum { TEXTURE_EXTERNAL = 0x8D65 }; // GL_TEXTURE_EXTERNAL_OES
public:
+ enum { TEXTURE_EXTERNAL = 0x8D65 }; // GL_TEXTURE_EXTERNAL_OES
typedef ConsumerBase::FrameAvailableListener FrameAvailableListener;
// GLConsumer constructs a new GLConsumer object. tex indicates the
@@ -82,8 +81,8 @@ public:
// context to another. If such a transfer is not needed there is no
// requirement that either of these methods be called.
GLConsumer(const sp<IGraphicBufferConsumer>& bq,
- uint32_t tex, uint32_t texureTarget = TEXTURE_EXTERNAL,
- bool useFenceSync = true, bool isControlledByApp = false);
+ uint32_t tex, uint32_t texureTarget, bool useFenceSync,
+ bool isControlledByApp);
// updateTexImage acquires the most recently queued buffer, and sets the
// image contents of the target texture to it.