Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Vulkan skia creation to use apiVersion instead of instanceVersion"

Browse Source
This commit is contained in:
Greg Daniel
2019-01-30 14:24:36 +00:00
committed by Android (Google) Code Review
parent 06f12cba1c eaf310e1ce
commit d8e7d56cdf
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/private/hwui/DrawVkInfo.h
View File

@@ -29,7 +29,7 @@ struct VkFunctorInitParams {
VkDevice device;
VkQueue queue;
uint32_t graphics_queue_index;
uint32_t instance_version;
uint32_t api_version;
const char* const* enabled_instance_extension_names;
uint32_t enabled_instance_extension_names_length;
const char* const* enabled_device_extension_names;

12
libs/hwui/renderthread/VulkanManager.cpp
View File

@@ -83,7 +83,6 @@ void VulkanManager::destroy() {
mDevice = VK_NULL_HANDLE;
mPhysicalDevice = VK_NULL_HANDLE;
mInstance = VK_NULL_HANDLE;
mInstanceVersion = 0u;
mInstanceExtensions.clear();
mDeviceExtensions.clear();
free_features_extensions_structs(mPhysicalDeviceFeatures2);
@@ -100,7 +99,7 @@ bool VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
0, // applicationVersion
"android framework", // pEngineName
0, // engineVerison
VK_MAKE_VERSION(1, 1, 0), // apiVersion
mAPIVersion, // apiVersion
};
{
@@ -377,8 +376,9 @@ void VulkanManager::initialize() {
}
GET_PROC(EnumerateInstanceVersion);
LOG_ALWAYS_FATAL_IF(mEnumerateInstanceVersion(&mInstanceVersion));
LOG_ALWAYS_FATAL_IF(mInstanceVersion < VK_MAKE_VERSION(1, 1, 0));
uint32_t instanceVersion;
LOG_ALWAYS_FATAL_IF(mEnumerateInstanceVersion(&instanceVersion));
LOG_ALWAYS_FATAL_IF(instanceVersion < VK_MAKE_VERSION(1, 1, 0));
GrVkExtensions extensions;
LOG_ALWAYS_FATAL_IF(!this->setupDevice(extensions, mPhysicalDeviceFeatures2));
@@ -398,7 +398,7 @@ void VulkanManager::initialize() {
backendContext.fDevice = mDevice;
backendContext.fQueue = mGraphicsQueue;
backendContext.fGraphicsQueueIndex = mGraphicsQueueIndex;
backendContext.fInstanceVersion = mInstanceVersion;
backendContext.fMaxAPIVersion = mAPIVersion;
backendContext.fVkExtensions = &extensions;
backendContext.fDeviceFeatures2 = &mPhysicalDeviceFeatures2;
backendContext.fGetProc = std::move(getProc);
@@ -446,7 +446,7 @@ VkFunctorInitParams VulkanManager::getVkFunctorInitParams() const {
.device = mDevice,
.queue = mGraphicsQueue,
.graphics_queue_index = mGraphicsQueueIndex,
.instance_version = mInstanceVersion,
.api_version = mAPIVersion,
.enabled_instance_extension_names = mInstanceExtensions.data(),
.enabled_instance_extension_names_length =
static_cast<uint32_t>(mInstanceExtensions.size()),

2
libs/hwui/renderthread/VulkanManager.h
View File

@@ -246,7 +246,7 @@ private:
VkCommandBuffer mDummyCB = VK_NULL_HANDLE;
// Variables saved to populate VkFunctorInitParams.
uint32_t mInstanceVersion = 0u;
static const uint32_t mAPIVersion = VK_MAKE_VERSION(1, 1, 0);
std::vector<const char*> mInstanceExtensions;
std::vector<const char*> mDeviceExtensions;
VkPhysicalDeviceFeatures2 mPhysicalDeviceFeatures2{};

2
native/webview/plat_support/draw_fn.h
View File

@@ -84,7 +84,7 @@ struct AwDrawFn_InitVkParams {
VkDevice device;
VkQueue queue;
uint32_t graphics_queue_index;
uint32_t instance_version;
uint32_t api_version;
const char* const* enabled_instance_extension_names;
uint32_t enabled_instance_extension_names_length;
const char* const* enabled_device_extension_names;

2
native/webview/plat_support/draw_functor.cpp
View File

@@ -102,7 +102,7 @@ void initializeVk(int functor, void* data,
.device = init_vk_params.device,
.queue = init_vk_params.queue,
.graphics_queue_index = init_vk_params.graphics_queue_index,
.instance_version = init_vk_params.instance_version,
.api_version = init_vk_params.api_version,
.enabled_instance_extension_names =
init_vk_params.enabled_instance_extension_names,
.enabled_instance_extension_names_length =