Merge "flatland: ConsumerBase-based classes now create their own BufferQueues" into main (00c3b291) · Commits · e / os / android_frameworks_native

cmds/flatland/GLHelper.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		#include <GLES2/gl2.h>
		#include <GLES2/gl2ext.h>
		#include <com_android_graphics_libgui_flags.h>
		#include <gui/SurfaceComposerClient.h>
		#include <ui/DisplayMode.h>

		@@ -202,6 +203,14 @@ bool GLHelper::getShaderProgram(const char* name, GLuint* outPgm) {

		bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h,
		sp<GLConsumer>* glConsumer, EGLSurface* surface) {
		#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
		sp<GLConsumer> glc = new GLConsumer(name, GL_TEXTURE_EXTERNAL_OES, false, true);
		glc->setDefaultBufferSize(w, h);
		glc->getSurface()->setMaxDequeuedBufferCount(2);
		glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);

		sp<ANativeWindow> anw = glc->getSurface();
		#else
		sp<IGraphicBufferProducer> producer;
		sp<IGraphicBufferConsumer> consumer;
		BufferQueue::createBufferQueue(&producer, &consumer);
		@@ -212,6 +221,7 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h,
		glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);

		sp<ANativeWindow> anw = new Surface(producer);
		#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
		EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), nullptr);
		if (s == EGL_NO_SURFACE) {
		fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());