Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
1d060841
Unverified
Commit
1d060841
authored
Nov 19, 2021
by
Lynne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vulkan: fix checkheaders
parent
f6dd30df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
Makefile
libavfilter/Makefile
+1
-1
Makefile
libavutil/Makefile
+3
-1
vulkan.h
libavutil/vulkan.h
+1
-4
vulkan_functions.h
libavutil/vulkan_functions.h
+6
-0
No files found.
libavfilter/Makefile
View file @
1d060841
...
...
@@ -576,7 +576,7 @@ OBJS-$(CONFIG_SHARED) += log2_tab.o
SKIPHEADERS-$(CONFIG_QSVVPP)
+=
qsvvpp.h
SKIPHEADERS-$(CONFIG_OPENCL)
+=
opencl.h
SKIPHEADERS-$(CONFIG_VAAPI)
+=
vaapi_vpp.h
SKIPHEADERS-$(CONFIG_VULKAN)
+=
vulkan.h
SKIPHEADERS-$(CONFIG_VULKAN)
+=
vulkan.h
vulkan_filter.h
TOOLS
=
graph2dot
TESTPROGS
=
drawutils filtfmts formats integral
...
...
libavutil/Makefile
View file @
1d060841
...
...
@@ -205,7 +205,9 @@ SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h
SKIPHEADERS-$(CONFIG_VAAPI)
+=
hwcontext_vaapi.h
SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)
+=
hwcontext_videotoolbox.h
SKIPHEADERS-$(CONFIG_VDPAU)
+=
hwcontext_vdpau.h
SKIPHEADERS-$(CONFIG_VULKAN)
+=
hwcontext_vulkan.h
SKIPHEADERS-$(CONFIG_VULKAN)
+=
hwcontext_vulkan.h
vulkan.h
\
vulkan_functions.h
\
vulkan_loader.h
TESTPROGS
=
adler32
\
aes
\
...
...
libavutil/vulkan.h
View file @
1d060841
...
...
@@ -19,14 +19,11 @@
#ifndef AVUTIL_VULKAN_H
#define AVUTIL_VULKAN_H
#define VK_NO_PROTOTYPES
#define VK_ENABLE_BETA_EXTENSIONS
#include "pixdesc.h"
#include "bprint.h"
#include "hwcontext.h"
#include "hwcontext_vulkan.h"
#include "vulkan_functions.h"
#include "hwcontext_vulkan.h"
#include "vulkan_loader.h"
#define FF_VK_DEFAULT_USAGE_FLAGS (VK_IMAGE_USAGE_SAMPLED_BIT | \
...
...
libavutil/vulkan_functions.h
View file @
1d060841
...
...
@@ -19,6 +19,12 @@
#ifndef AVUTIL_VULKAN_FUNCTIONS_H
#define AVUTIL_VULKAN_FUNCTIONS_H
#define VK_NO_PROTOTYPES
#define VK_ENABLE_BETA_EXTENSIONS
#include "hwcontext.h"
#include "hwcontext_vulkan.h"
/* An enum of bitflags for every optional extension we need */
typedef
enum
FFVulkanExtensions
{
FF_VK_EXT_EXTERNAL_DMABUF_MEMORY
=
1ULL
<<
0
,
/* VK_EXT_external_memory_dma_buf */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment