Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5422e9 authored Aug 06, 2024 by Chris Forbes Committed by Automerger Merge Worker Aug 06, 2024

Merge changes I1e6c3c80,I4310618c into main am: 5a206588 am: 3150c969

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3205054

Change-Id: I4c98c1a8621b80b0f68617bc8e77e7605888e139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 70dc5ced 3150c969

opengl/libs/EGL/Loader.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -270,7 +270,7 @@ void* Loader::open(egl_connection_t* cnx) {
	hnd = attempt_to_load_updated_driver(cnx);		hnd = attempt_to_load_updated_driver(cnx);

	// If updated driver apk is set but fail to load, abort here.		// If updated driver apk is set but fail to load, abort here.
	LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace(),		LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace() && !hnd,
	"couldn't find an OpenGL ES implementation from %s",		"couldn't find an OpenGL ES implementation from %s",
	android::GraphicsEnv::getInstance().getDriverPath().c_str());		android::GraphicsEnv::getInstance().getDriverPath().c_str());
	}		}

vulkan/libvulkan/driver.cpp

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -339,10 +339,13 @@ void Hal::UnloadBuiltinDriver() {

	ALOGD("Unload builtin Vulkan driver.");		ALOGD("Unload builtin Vulkan driver.");

			if (hal_.dev_->common.close != nullptr)
			{
	// Close the opened device		// Close the opened device
	int err = hal_.dev_->common.close(		int err = hal_.dev_->common.close(
	const_cast<struct hw_device_t*>(&hal_.dev_->common));		const_cast<struct hw_device_t*>(&hal_.dev_->common));
	ALOG_ASSERT(!err, "hw_device_t::close() failed.");		ALOG_ASSERT(!err, "hw_device_t::close() failed.");
			}

	// Close the opened shared library in the hw_module_t		// Close the opened shared library in the hw_module_t
	android_unload_sphal_library(hal_.dev_->common.module->dso);		android_unload_sphal_library(hal_.dev_->common.module->dso);