Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
9c107738
O
Obs Studio
项目概览
小白菜888
/
Obs Studio
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Obs Studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9c107738
编写于
6月 21, 2020
作者:
J
Jim
提交者:
GitHub
6月 21, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3015 from jpark37/vulkan-external-fixes
win-capture: Improve Vulkan synchronization
上级
129a946e
83dd9c85
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
9 deletion
+12
-9
plugins/win-capture/graphics-hook/vulkan-capture.c
plugins/win-capture/graphics-hook/vulkan-capture.c
+12
-9
未找到文件。
plugins/win-capture/graphics-hook/vulkan-capture.c
浏览文件 @
9c107738
...
...
@@ -854,9 +854,9 @@ static void vk_shtex_capture(struct vk_data *data,
imb
.
sType
=
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER
;
imb
.
pNext
=
NULL
;
imb
.
srcAccessMask
=
0
;
imb
.
dstAccessMask
=
VK_ACCESS_TRANSFER_WRITE_BIT
;
imb
.
dstAccessMask
=
0
;
imb
.
oldLayout
=
VK_IMAGE_LAYOUT_UNDEFINED
;
imb
.
newLayout
=
VK_IMAGE_LAYOUT_
TRANSFER_DST_OPTIM
AL
;
imb
.
newLayout
=
VK_IMAGE_LAYOUT_
GENER
AL
;
imb
.
srcQueueFamilyIndex
=
VK_QUEUE_FAMILY_IGNORED
;
imb
.
dstQueueFamilyIndex
=
VK_QUEUE_FAMILY_IGNORED
;
imb
.
image
=
swap
->
export_image
;
...
...
@@ -868,8 +868,8 @@ static void vk_shtex_capture(struct vk_data *data,
funcs
->
CmdPipelineBarrier
(
cmd_buffer
,
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
,
VK_PIPELINE_STAGE_T
RANSFER_BIT
,
0
,
0
,
NULL
,
0
,
NULL
,
1
,
&
imb
);
VK_PIPELINE_STAGE_T
OP_OF_PIPE_BIT
,
0
,
0
,
NULL
,
0
,
NULL
,
1
,
&
imb
);
swap
->
layout_initialized
=
true
;
}
...
...
@@ -897,9 +897,9 @@ static void vk_shtex_capture(struct vk_data *data,
dst_mb
->
sType
=
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER
;
dst_mb
->
pNext
=
NULL
;
dst_mb
->
srcAccessMask
=
VK_ACCESS_TRANSFER_WRITE_BIT
;
dst_mb
->
srcAccessMask
=
0
;
dst_mb
->
dstAccessMask
=
VK_ACCESS_TRANSFER_WRITE_BIT
;
dst_mb
->
oldLayout
=
VK_IMAGE_LAYOUT_
TRANSFER_DST_OPTIM
AL
;
dst_mb
->
oldLayout
=
VK_IMAGE_LAYOUT_
GENER
AL
;
dst_mb
->
newLayout
=
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
;
dst_mb
->
srcQueueFamilyIndex
=
VK_QUEUE_FAMILY_EXTERNAL
;
dst_mb
->
dstQueueFamilyIndex
=
fam_idx
;
...
...
@@ -911,8 +911,7 @@ static void vk_shtex_capture(struct vk_data *data,
dst_mb
->
subresourceRange
.
layerCount
=
1
;
funcs
->
CmdPipelineBarrier
(
cmd_buffer
,
VK_PIPELINE_STAGE_TRANSFER_BIT
|
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
,
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
,
VK_PIPELINE_STAGE_TRANSFER_BIT
,
0
,
0
,
NULL
,
0
,
NULL
,
2
,
mb
);
...
...
@@ -953,11 +952,15 @@ static void vk_shtex_capture(struct vk_data *data,
src_mb
->
oldLayout
=
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL
;
src_mb
->
newLayout
=
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
;
dst_mb
->
srcAccessMask
=
VK_ACCESS_TRANSFER_WRITE_BIT
;
dst_mb
->
dstAccessMask
=
0
;
dst_mb
->
oldLayout
=
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
;
dst_mb
->
newLayout
=
VK_IMAGE_LAYOUT_GENERAL
;
dst_mb
->
srcQueueFamilyIndex
=
fam_idx
;
dst_mb
->
dstQueueFamilyIndex
=
VK_QUEUE_FAMILY_EXTERNAL
;
funcs
->
CmdPipelineBarrier
(
cmd_buffer
,
VK_PIPELINE_STAGE_TRANSFER_BIT
,
VK_PIPELINE_STAGE_T
RANSFER
_BIT
|
VK_PIPELINE_STAGE_T
OP_OF_PIPE
_BIT
|
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
,
0
,
0
,
NULL
,
0
,
NULL
,
2
,
mb
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录