Unified · Split
| @@ -576,7 +576,7 @@ OBJS-$(CONFIG_SHARED) += log2_tab.o · 575 unmodified lines | |||
| 576 | SKIPHEADERS-$(CONFIG_QSVVPP) += qsvvpp.h | 576 | SKIPHEADERS-$(CONFIG_QSVVPP) += qsvvpp.h |
| 577 | SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h | 577 | SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h |
| 578 | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_vpp.h | 578 | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_vpp.h |
| 579 | SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h | 579 | SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_filter.h |
| 580 | 580 | ||
| 581 | TOOLS = graph2dot | 581 | TOOLS = graph2dot |
| 582 | TESTPROGS = drawutils filtfmts formats integral | 582 | TESTPROGS = drawutils filtfmts formats integral |
| @@ -205,7 +205,9 @@ SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h · 204 unmodified lines | |||
| 205 | SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h | 205 | SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h |
| 206 | SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.h | 206 | SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.h |
| 207 | SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h | 207 | SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h |
| 208 | SKIPHEADERS-$(CONFIG_VULKAN) += hwcontext_vulkan.h | 208 | SKIPHEADERS-$(CONFIG_VULKAN) += hwcontext_vulkan.h vulkan.h \ |
| 209 | vulkan_functions.h \ | ||
| 210 | vulkan_loader.h | ||
| 209 | 211 | ||
| 210 | TESTPROGS = adler32 \ | 212 | TESTPROGS = adler32 \ |
| 211 | aes \ | 213 | aes \ |
| @@ -19,14 +19,11 @@ · 18 unmodified lines | |||
| 19 | #ifndef AVUTIL_VULKAN_H | 19 | #ifndef AVUTIL_VULKAN_H |
| 20 | #define AVUTIL_VULKAN_H | 20 | #define AVUTIL_VULKAN_H |
| 21 | 21 | ||
| 22 | #define VK_NO_PROTOTYPES | ||
| 23 | #define VK_ENABLE_BETA_EXTENSIONS | ||
| 24 | |||
| 25 | #include "pixdesc.h" | 22 | #include "pixdesc.h" |
| 26 | #include "bprint.h" | 23 | #include "bprint.h" |
| 27 | #include "hwcontext.h" | 24 | #include "hwcontext.h" |
| 28 | #include "hwcontext_vulkan.h" | ||
| 29 | #include "vulkan_functions.h" | 25 | #include "vulkan_functions.h" |
| 26 | #include "hwcontext_vulkan.h" | ||
| 30 | #include "vulkan_loader.h" | 27 | #include "vulkan_loader.h" |
| 31 | 28 | ||
| 32 | #define FF_VK_DEFAULT_USAGE_FLAGS (VK_IMAGE_USAGE_SAMPLED_BIT | \ | 29 | #define FF_VK_DEFAULT_USAGE_FLAGS (VK_IMAGE_USAGE_SAMPLED_BIT | \ |
| @@ -19,6 +19,12 @@ · 18 unmodified lines | |||
| 19 | #ifndef AVUTIL_VULKAN_FUNCTIONS_H | 19 | #ifndef AVUTIL_VULKAN_FUNCTIONS_H |
| 20 | #define AVUTIL_VULKAN_FUNCTIONS_H | 20 | #define AVUTIL_VULKAN_FUNCTIONS_H |
| 21 | 21 | ||
| 22 | #define VK_NO_PROTOTYPES | ||
| 23 | #define VK_ENABLE_BETA_EXTENSIONS | ||
| 24 | |||
| 25 | #include "hwcontext.h" | ||
| 26 | #include "hwcontext_vulkan.h" | ||
| 27 | |||
| 22 | /* An enum of bitflags for every optional extension we need */ | 28 | /* An enum of bitflags for every optional extension we need */ |
| 23 | typedef enum FFVulkanExtensions { | 29 | typedef enum FFVulkanExtensions { |
| 24 | FF_VK_EXT_EXTERNAL_DMABUF_MEMORY = 1ULL << 0, /* VK_EXT_external_memory_dma_buf */ | 30 | FF_VK_EXT_EXTERNAL_DMABUF_MEMORY = 1ULL << 0, /* VK_EXT_external_memory_dma_buf */ |