Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 134d9580 authored by Chris Forbes's avatar Chris Forbes
Browse files

vulkan: Fix oversights in V6 of android native buffer 

- We want a *Flags, not a *FlagBits here.
- Header failed to declare the VK_STRUCTURE_TYPE enum, although it was
  declared in api file.

  Found by trying to actually use this.

Test: build
Change-Id: I656b6095a428c116b769073d825c747aff24d12b
parent 48853713

vulkan/api/vulkan.api

+1 −1
Original line number Diff line number Diff line
@@ -2900,7 +2900,7 @@ class VkNativeBufferANDROID { 
class VkSwapchainImageCreateInfoANDROID {

    VkStructureType                             sType

    const void*                                 pNext

    VkSwapchainImageUsageFlagBitsANDROID        flags

    VkSwapchainImageUsageFlagsANDROID           flags

}



@extension("VK_GOOGLE_display_timing")

vulkan/doc/implementors_guide/implementors_guide.adoc

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ typedef struct { 
    VkStructureType                        sType; // must be VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID

    const void*                            pNext;



    VkSwapchainImageUsageFlagBitsANDROID   usage;

    VkSwapchainImageUsageFlagsANDROID      usage;

} VkSwapchainImageCreateInfoANDROID;

----

vulkan/doc/implementors_guide/implementors_guide.html

+2 −2
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ http://www.gnu.org/software/src-highlite --> 
    <span style="color: #008080">VkStructureType</span>                        sType<span style="color: #990000">;</span> <span style="font-style: italic"><span style="color: #9A1900">// must be VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID</span></span>

    <span style="font-weight: bold"><span style="color: #0000FF">const</span></span> <span style="color: #009900">void</span><span style="color: #990000">*</span>                            pNext<span style="color: #990000">;</span>



    <span style="color: #008080">VkSwapchainImageUsageFlagBitsANDROID</span>   usage<span style="color: #990000">;</span>

    <span style="color: #008080">VkSwapchainImageUsageFlagsANDROID</span>      usage<span style="color: #990000">;</span>

<span style="color: #FF0000">}</span> VkSwapchainImageCreateInfoANDROID<span style="color: #990000">;</span></tt></pre></div></div>

<div class="paragraph"><p><span class="monospaced">vkAcquireImageANDROID</span> acquires ownership of a swapchain image and imports an

externally-signalled native fence into both an existing VkSemaphore object
@@ -1052,7 +1052,7 @@ Added VkSwapchainImageCreateInfoANDROID 
<div id="footer">

<div id="footer-text">

Version 5<br>

Last updated 2017-01-09 09:52:43 NZDT

Last updated 2017-01-12 14:25:30 NZDT

</div>

</div>

</body>

vulkan/include/vulkan/vk_android_native_buffer.h

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern "C" { 


#define VK_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)(1000000000 + (1000 * (VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER - 1)) + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID   VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)

#define VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 1)



typedef enum VkSwapchainImageUsageFlagBitsANDROID {

    VK_SWAPCHAIN_IMAGE_USAGE_FRONT_BUFFER_BIT_ANDROID = 0x00000001,
@@ -56,7 +57,7 @@ typedef struct { 
    VkStructureType                        sType; // must be VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID

    const void*                            pNext;



    VkSwapchainImageUsageFlagBitsANDROID   usage;

    VkSwapchainImageUsageFlagsANDROID      usage;

} VkSwapchainImageCreateInfoANDROID;



typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageANDROID)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, int* grallocUsage);