Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
dc9cf7f2
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
dc9cf7f2
编写于
5月 15, 2020
作者:
L
Lynne
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hwcontext_vulkan: move physical device feature discovery to device_init
Otherwise custom vulkan device contexts won't work.
上级
d870e75c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
14 deletion
+16
-14
libavutil/hwcontext_vulkan.c
libavutil/hwcontext_vulkan.c
+16
-14
未找到文件。
libavutil/hwcontext_vulkan.c
浏览文件 @
dc9cf7f2
...
...
@@ -523,7 +523,6 @@ static int find_device(AVHWDeviceContext *ctx, VulkanDeviceSelection *select)
VkPhysicalDevice
*
devices
=
NULL
;
VkPhysicalDeviceIDProperties
*
idp
=
NULL
;
VkPhysicalDeviceProperties2
*
prop
=
NULL
;
VulkanDevicePriv
*
p
=
ctx
->
internal
->
priv
;
AVVulkanDeviceContext
*
hwctx
=
ctx
->
hwctx
;
ret
=
vkEnumeratePhysicalDevices
(
hwctx
->
inst
,
&
num
,
NULL
);
...
...
@@ -627,10 +626,9 @@ static int find_device(AVHWDeviceContext *ctx, VulkanDeviceSelection *select)
}
end:
if
(
choice
>
-
1
)
{
p
->
dev_is_nvidia
=
(
prop
[
choice
].
properties
.
vendorID
==
0x10de
);
if
(
choice
>
-
1
)
hwctx
->
phys_dev
=
devices
[
choice
];
}
av_free
(
devices
);
av_free
(
prop
);
av_free
(
idp
);
...
...
@@ -999,16 +997,6 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx,
if
((
err
=
find_device
(
ctx
,
dev_select
)))
goto
end
;
vkGetPhysicalDeviceProperties
(
hwctx
->
phys_dev
,
&
p
->
props
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"Using device: %s
\n
"
,
p
->
props
.
deviceName
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"Alignments:
\n
"
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" optimalBufferCopyOffsetAlignment: %li
\n
"
,
p
->
props
.
limits
.
optimalBufferCopyOffsetAlignment
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" optimalBufferCopyRowPitchAlignment: %li
\n
"
,
p
->
props
.
limits
.
optimalBufferCopyRowPitchAlignment
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" minMemoryMapAlignment: %li
\n
"
,
p
->
props
.
limits
.
minMemoryMapAlignment
);
vkGetPhysicalDeviceFeatures
(
hwctx
->
phys_dev
,
&
dev_features
);
#define COPY_FEATURE(DST, NAME) (DST).features.NAME = dev_features.NAME;
COPY_FEATURE
(
hwctx
->
device_features
,
shaderImageGatherExtended
)
...
...
@@ -1064,17 +1052,31 @@ static int vulkan_device_init(AVHWDeviceContext *ctx)
AVVulkanDeviceContext
*
hwctx
=
ctx
->
hwctx
;
VulkanDevicePriv
*
p
=
ctx
->
internal
->
priv
;
vkGetPhysicalDeviceProperties
(
hwctx
->
phys_dev
,
&
p
->
props
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"Using device: %s
\n
"
,
p
->
props
.
deviceName
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"Alignments:
\n
"
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" optimalBufferCopyOffsetAlignment: %li
\n
"
,
p
->
props
.
limits
.
optimalBufferCopyOffsetAlignment
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" optimalBufferCopyRowPitchAlignment: %li
\n
"
,
p
->
props
.
limits
.
optimalBufferCopyRowPitchAlignment
);
av_log
(
ctx
,
AV_LOG_VERBOSE
,
" minMemoryMapAlignment: %li
\n
"
,
p
->
props
.
limits
.
minMemoryMapAlignment
);
/* Set device extension flags */
for
(
int
i
=
0
;
i
<
hwctx
->
nb_enabled_dev_extensions
;
i
++
)
{
for
(
int
j
=
0
;
j
<
FF_ARRAY_ELEMS
(
optional_device_exts
);
j
++
)
{
if
(
!
strcmp
(
hwctx
->
enabled_dev_extensions
[
i
],
optional_device_exts
[
j
].
name
))
{
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"Using device extension %s
\n
"
,
hwctx
->
enabled_dev_extensions
[
i
]);
p
->
extensions
|=
optional_device_exts
[
j
].
flag
;
break
;
}
}
}
p
->
dev_is_nvidia
=
(
p
->
props
.
vendorID
==
0x10de
);
vkGetPhysicalDeviceQueueFamilyProperties
(
hwctx
->
phys_dev
,
&
queue_num
,
NULL
);
if
(
!
queue_num
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Failed to get queues!
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录