am b65f32eb: Fix two EGLConfig selection bugs (92d7c3ee) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+18 −21

Original line number	Diff line number	Diff line
		@@ -366,12 +366,10 @@ public:
		operator EGLint const* () const { return &mList.keyAt(0).v; }
		};

		EGLConfig SurfaceFlinger::selectEGLConfig(EGLDisplay display, EGLint nativeVisualId,
		EGLint renderableType) {
		status_t SurfaceFlinger::selectEGLConfig(EGLDisplay display, EGLint nativeVisualId,
		EGLint renderableType, EGLConfig* config) {
		// select our EGLConfig. It must support EGL_RECORDABLE_ANDROID if
		// it is to be used with WIFI displays
		EGLConfig config;
		EGLint dummy;
		status_t err;
		EGLint wantedAttribute;
		EGLint wantedAttributeValue;
		@@ -390,22 +388,18 @@ EGLConfig SurfaceFlinger::selectEGLConfig(EGLDisplay display, EGLint nativeVisua

		} else {
		// if no renderable type specified, fallback to a simplified query
		attribs[EGL_RECORDABLE_ANDROID] = EGL_TRUE;
		wantedAttribute = EGL_NATIVE_VISUAL_ID;
		wantedAttributeValue = nativeVisualId;
		}

		err = selectConfigForAttribute(display, attribs, wantedAttribute,
		wantedAttributeValue, &config);
		if (!err)
		goto success;

		return 0;

		success:
		if (eglGetConfigAttrib(display, config, EGL_CONFIG_CAVEAT, &dummy))
		ALOGW_IF(dummy == EGL_SLOW_CONFIG, "EGL_SLOW_CONFIG selected!");
		return config;
		wantedAttributeValue, config);
		if (err == NO_ERROR) {
		EGLint caveat;
		if (eglGetConfigAttrib(display, *config, EGL_CONFIG_CAVEAT, &caveat))
		ALOGW_IF(caveat == EGL_SLOW_CONFIG, "EGL_SLOW_CONFIG selected!");
		}
		return err;
		}

		void SurfaceFlinger::init() {
		@@ -413,6 +407,7 @@ void SurfaceFlinger::init() {
		ALOGI( "SurfaceFlinger's main thread ready to run. "
		"Initializing graphics H/W...");

		status_t err;
		Mutex::Autolock _l(mStateLock);

		// initialize EGL for the default display
		@@ -425,21 +420,23 @@ void SurfaceFlinger::init() {
		static_cast<HWComposer::EventHandler >(this));

		// First try to get an ES2 config
		mEGLConfig = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(), EGL_OPENGL_ES2_BIT);
		err = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(), EGL_OPENGL_ES2_BIT,
		&mEGLConfig);

		if (!mEGLConfig) {
		if (err != NO_ERROR) {
		// If ES2 fails, try ES1
		mEGLConfig = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(), EGL_OPENGL_ES_BIT);
		err = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(),
		EGL_OPENGL_ES_BIT, &mEGLConfig);
		}

		if (!mEGLConfig) {
		if (err != NO_ERROR) {
		// still didn't work, probably because we're on the emulator...
		// try a simplified query
		ALOGW("no suitable EGLConfig found, trying a simpler query");
		mEGLConfig = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(), 0);
		err = selectEGLConfig(mEGLDisplay, mHwc->getVisualID(), 0, &mEGLConfig);
		}

		if (!mEGLConfig) {
		if (err != NO_ERROR) {
		// this EGL is too lame for android
		LOG_ALWAYS_FATAL("no suitable EGLConfig found, giving up");
		}

services/surfaceflinger/SurfaceFlinger.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -317,8 +317,8 @@ private:
		*/
		static status_t selectConfigForAttribute(EGLDisplay dpy,
		EGLint const* attrs, EGLint attribute, EGLint value, EGLConfig* outConfig);
		static EGLConfig selectEGLConfig(EGLDisplay disp, EGLint visualId,
		EGLint renderableType);
		static status_t selectEGLConfig(EGLDisplay disp, EGLint visualId,
		EGLint renderableType, EGLConfig* config);
		size_t getMaxTextureSize() const;
		size_t getMaxViewportDims() const;