Snap for 4373608 from be1a67cacfda4d9f4311d4257a57b023780f10f8 to pi-release (2a747dcb) · Commits · e / os / android_frameworks_native-old

opengl/libs/EGL/egl_object.cpp

+16 −10

Original line number	Diff line number	Diff line
		@@ -116,6 +116,11 @@ void egl_context_t::onMakeCurrent(EGLSurface draw, EGLSurface read) {
		if (gl_extensions.empty()) {
		// call the implementation's glGetString(GL_EXTENSIONS)
		const char* exts = (const char *)gEGLImpl.hooks[version]->gl.glGetString(GL_EXTENSIONS);

		// If this context is sharing with another context, and the other context was reset
		// e.g. due to robustness failure, this context might also be reset and glGetString can
		// return NULL.
		if (exts) {
		gl_extensions = exts;
		if (gl_extensions.find("GL_EXT_debug_marker") == std::string::npos) {
		gl_extensions.insert(0, "GL_EXT_debug_marker ");
		@@ -130,6 +135,7 @@ void egl_context_t::onMakeCurrent(EGLSurface draw, EGLSurface read) {
		}
		}
		}
		}

		// ----------------------------------------------------------------------------
		}; // namespace android

+3 −5

Original line number	Diff line number	Diff line
		@@ -640,11 +640,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,
		instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);

		const VkSurfaceFormatKHR kWideColorFormats[] = {
		{VK_FORMAT_R16G16B16A16_SFLOAT,
		VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT},
		{VK_FORMAT_R16G16B16A16_SFLOAT,
		VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT},
		{VK_FORMAT_A2R10G10B10_UNORM_PACK32,
		{VK_FORMAT_R8G8B8A8_UNORM,
		VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
		{VK_FORMAT_R8G8B8A8_SRGB,
		VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},
		};
		const uint32_t kNumWideColorFormats =