Merge "Update deprecated GrVk type references" into main (e43ad598) · Commits · e / os / android_frameworks_native

libs/renderengine/skia/VulkanInterface.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -197,7 +197,9 @@ void VulkanInterface::onVkDeviceFault(void* callbackContext, const std::string&
		LOG_ALWAYS_FATAL("%s", crashMsg.str().c_str());
		};

		static GrVkGetProc sGetProc = [](const char* proc_name, VkInstance instance, VkDevice device) {
		static skgpu::VulkanGetProc sGetProc = [](const char* proc_name,
		VkInstance instance,
		VkDevice device) {
		if (device != VK_NULL_HANDLE) {
		return vkGetDeviceProcAddr(device, proc_name);
		}
		@@ -604,7 +606,7 @@ void VulkanInterface::teardown() {
		mQueue = VK_NULL_HANDLE; // Implicitly destroyed by destroying mDevice.
		mQueueIndex = 0;
		mApiVersion = 0;
		mGrExtensions = GrVkExtensions();
		mGrExtensions = skgpu::VulkanExtensions();
		mGrGetProc = nullptr;
		mIsProtected = false;
		mIsRealtimePriority = false;

+4 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@
		#pragma once

		#include <include/gpu/vk/GrVkBackendContext.h>
		#include <include/gpu/vk/GrVkExtensions.h>
		#include <include/gpu/vk/VulkanExtensions.h>
		#include <include/gpu/vk/VulkanTypes.h>

		#include <vulkan/vulkan.h>

		@@ -85,12 +86,12 @@ private:
		VkQueue mQueue = VK_NULL_HANDLE;
		int mQueueIndex = 0;
		uint32_t mApiVersion = 0;
		GrVkExtensions mGrExtensions;
		skgpu::VulkanExtensions mGrExtensions;
		VkPhysicalDeviceFeatures2* mPhysicalDeviceFeatures2 = nullptr;
		VkPhysicalDeviceSamplerYcbcrConversionFeatures* mSamplerYcbcrConversionFeatures = nullptr;
		VkPhysicalDeviceProtectedMemoryFeatures* mProtectedMemoryFeatures = nullptr;
		VkPhysicalDeviceFaultFeaturesEXT* mDeviceFaultFeatures = nullptr;
		GrVkGetProc mGrGetProc = nullptr;
		skgpu::VulkanGetProc mGrGetProc = nullptr;
		bool mIsProtected = false;
		bool mIsRealtimePriority = false;