diff options
author | Greg Daniel <egdaniel@google.com> | 2019-01-28 16:10:32 -0500 |
---|---|---|
committer | Greg Daniel <egdaniel@google.com> | 2019-01-29 15:03:10 -0500 |
commit | eaf310e1ce16ddee996bd13af648021865ddeff7 (patch) | |
tree | 460920e5864c08f74c50951f131c2b28c7767891 /native/webview | |
parent | fdbddda50e329936efe080d742d33bdae83c53fa (diff) |
Update Vulkan skia creation to use apiVersion instead of instanceVersion
This updates to use Skia's new api which takes the vulkan apiVersion
instead of the instance version. This is technically more correct since
the application apiVersion is really the only client modifiable version
value in vulkan.
This change also updates the webview structs to use the apiVersion as
well.
Test: manual build and testing.
Change-Id: I6ce7c20949eb7242f7bbe69955b54c0785696891
Diffstat (limited to 'native/webview')
-rw-r--r-- | native/webview/plat_support/draw_fn.h | 2 | ||||
-rw-r--r-- | native/webview/plat_support/draw_functor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/native/webview/plat_support/draw_fn.h b/native/webview/plat_support/draw_fn.h index e31ce195214f..5b3e496be81a 100644 --- a/native/webview/plat_support/draw_fn.h +++ b/native/webview/plat_support/draw_fn.h @@ -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; diff --git a/native/webview/plat_support/draw_functor.cpp b/native/webview/plat_support/draw_functor.cpp index afe103a25043..6deb47f09347 100644 --- a/native/webview/plat_support/draw_functor.cpp +++ b/native/webview/plat_support/draw_functor.cpp @@ -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 = |