diff options
author | Clay Murphy <claym@google.com> | 2017-07-05 18:28:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-05 18:28:51 +0000 |
commit | 26a6e1b2badf69ddc616ec51687c1d3ecfd8b646 (patch) | |
tree | 2f328d0210689bc9c33bcb0852617cf66e2791aa /en/devices/graphics/implement-vulkan.html | |
parent | d9c0a94dd500fc616309192152fa737a83c185d8 (diff) | |
parent | e839b247f863ec564ef505aa4451e839511f37aa (diff) | |
download | source.android.com-26a6e1b2badf69ddc616ec51687c1d3ecfd8b646.tar.gz |
resolve merge conflicts of 4a5bcd6f to stage-aosp-master am: 3a7443d79d am: 6890bab6d9
am: e839b247f8
Change-Id: Ic3d133e2d10255f4ffdf486642b15a7ece37aec9
Diffstat (limited to 'en/devices/graphics/implement-vulkan.html')
-rw-r--r-- | en/devices/graphics/implement-vulkan.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/en/devices/graphics/implement-vulkan.html b/en/devices/graphics/implement-vulkan.html index 918343e1..b2a5c283 100644 --- a/en/devices/graphics/implement-vulkan.html +++ b/en/devices/graphics/implement-vulkan.html @@ -80,12 +80,10 @@ image is built. The loader uses the existing HAL mechanism (see <code><a href="h for discovering and loading the driver. Preferred paths for 32-bit and 64-bit Vulkan drivers are:</p> -<p> <pre class="devsite-click-to-copy"> /vendor/lib/hw/vulkan.<ro.product.platform>.so /vendor/lib64/hw/vulkan.<ro.product.platform>.so </pre> -</p> <p>Where <<code>ro.product.platform</code>> is replaced by the value of the system property of that name. For details and supported alternative @@ -175,7 +173,6 @@ implementation-defined private gralloc usage flags. When creating a swapchain, the platform asks the driver to translate the requested format and image usage flags into gralloc usage flags by calling:</p> -<p> <pre class="devsite-click-to-copy"> VkResult VKAPI vkGetSwapchainGrallocUsageANDROID( VkDevice device, @@ -184,7 +181,6 @@ VkResult VKAPI vkGetSwapchainGrallocUsageANDROID( int* grallocUsage ); </pre> -</p> <p>The <code>format</code> and <code>imageUsage</code> parameters are taken from the <code>VkSwapchainCreateInfoKHR</code> structure. The driver should fill @@ -234,7 +230,7 @@ the following data:</p> .sharingMode = VkSwapChainCreateInfoWSI::sharingMode .queueFamilyCount = VkSwapChainCreateInfoWSI::queueFamilyCount .pQueueFamilyIndices = VkSwapChainCreateInfoWSI::pQueueFamilyIndices -</pre></p> +</pre> <h3 id=acquire_image>Aquiring images</h3> <p><code>vkAcquireImageANDROID</code> acquires ownership of a swapchain image |