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

Commit 3e0dc8f0 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Update from version 0.198.0 to 0.200.0 

Change-Id: I071a9143332dd8b8c2ef899105073ed8791fc5db
(cherry picked from commit 9568691bea351152b340c0cbb3d31e5246ac469b)
parent 65ab552c

vulkan/api/vulkan.api

+161 −212

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/include/vulkan/vk_ext_android_native_buffer.h→vulkan/include/vulkan/vk_android_native_buffer.h

+8 −8
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 
 * limitations under the License.

 */



#ifndef __VK_EXT_ANDROID_NATIVE_BUFFER_H__

#define __VK_EXT_ANDROID_NATIVE_BUFFER_H__

#ifndef __VK_ANDROID_NATIVE_BUFFER_H__

#define __VK_ANDROID_NATIVE_BUFFER_H__



#include <vulkan/vulkan.h>

#include <system/window.h>



// TODO(jessehall): Get a real extension number officially assigned.

#define VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER 1024

#define VK_EXT_ANDROID_NATIVE_BUFFER_REVISION         1

#define VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NAME   "VK_EXT_ANDROID_gralloc"

#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER 1024

#define VK_ANDROID_NATIVE_BUFFER_REVISION         1

#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME   "VK_ANDROID_native_buffer"



#ifdef __cplusplus

extern "C" {
@@ -31,8 +31,8 @@ extern "C" { 


// See https://gitlab.khronos.org/vulkan/vulkan/blob/master/doc/proposals/proposed/NVIDIA/VulkanRegistryProposal.txt

// and Khronos bug 14154 for explanation of these magic numbers.

#define VK_EXT_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)((int)0xc0000000 - VK_EXT_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER * -1024 + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID       VK_EXT_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)

#define VK_ANDROID_NATIVE_BUFFER_ENUM(type,id)    ((type)((int)0xc0000000 - VK_ANDROID_NATIVE_BUFFER_EXTENSION_NUMBER * -1024 + (id)))

#define VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID   VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 0)



typedef struct {

    VkStructureType             sType; // must be VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID
@@ -90,4 +90,4 @@ VkResult VKAPI vkQueueSignalNativeFenceANDROID( 
}

#endif



#endif // __VK_EXT_ANDROID_NATIVE_BUFFER_H__
 
#endif // __VK_ANDROID_NATIVE_BUFFER_H__

vulkan/include/vulkan/vulkan.h

+327 −352

File changed.

Preview size limit exceeded, changes collapsed.

vulkan/libvulkan/entry.cpp

+0 −10
Original line number Diff line number Diff line
@@ -346,16 +346,6 @@ void vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const V 
    GetVtbl(device).DestroyShaderModule(device, shaderModule, pAllocator);

}



__attribute__((visibility("default")))

VkResult vkCreateShader(VkDevice device, const VkShaderCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShader* pShader) {

    return GetVtbl(device).CreateShader(device, pCreateInfo, pAllocator, pShader);

}



__attribute__((visibility("default")))

void vkDestroyShader(VkDevice device, VkShader shader, const VkAllocationCallbacks* pAllocator) {

    GetVtbl(device).DestroyShader(device, shader, pAllocator);

}



__attribute__((visibility("default")))

VkResult vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) {

    return GetVtbl(device).CreatePipelineCache(device, pCreateInfo, pAllocator, pPipelineCache);

vulkan/libvulkan/entry.cpp.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ namespace { 
  {{$ext := GetAnnotation $ "extension"}}

  {{if $ext}}

    {{$extval := index $ext.Arguments 0}}

    {{if      eq $extval "VK_EXT_KHR_surface"}}true

    {{else if eq $extval "VK_EXT_KHR_swapchain"}}true

    {{else if eq $extval "VK_EXT_KHR_android_surface"}}true{{end}}

    {{if      eq $extval "VK_KHR_surface"}}true

    {{else if eq $extval "VK_KHR_swapchain"}}true

    {{else if eq $extval "VK_KHR_android_surface"}}true{{end}}

  {{else}}true{{end}}

{{end}}