Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
f56d6781
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f56d6781
编写于
7月 21, 2017
作者:
F
freiling
提交者:
GitHub
7月 21, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Revert "[content handler] move to MX_EVENT_SIGNALED for fences (#3912)" (#3913)" (#3914)
This reverts commit
47349a35
.
上级
47349a35
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
5 deletion
+5
-5
content_handler/vulkan_surface.cc
content_handler/vulkan_surface.cc
+5
-5
未找到文件。
content_handler/vulkan_surface.cc
浏览文件 @
f56d6781
...
@@ -39,7 +39,7 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProcTable& p_vk,
...
@@ -39,7 +39,7 @@ VulkanSurface::VulkanSurface(vulkan::VulkanProcTable& p_vk,
}
}
event_handler_key_
=
mtl
::
MessageLoop
::
GetCurrent
()
->
AddHandler
(
event_handler_key_
=
mtl
::
MessageLoop
::
GetCurrent
()
->
AddHandler
(
this
,
release_event_
.
get
(),
MX_
USER_SIGNAL_0
);
this
,
release_event_
.
get
(),
MX_
EVENT_SIGNALED
);
// Probably not necessary as the events should be in the unsignalled state
// Probably not necessary as the events should be in the unsignalled state
// already.
// already.
...
@@ -302,7 +302,7 @@ void VulkanSurface::SignalWritesFinished(
...
@@ -302,7 +302,7 @@ void VulkanSurface::SignalWritesFinished(
"has not yet been acknowledged by the compositor."
;
"has not yet been acknowledged by the compositor."
;
// Signal the acquire end to the compositor.
// Signal the acquire end to the compositor.
if
(
acquire_event_
.
signal
(
0u
,
MX_
USER_SIGNAL_0
)
!=
MX_OK
)
{
if
(
acquire_event_
.
signal
(
0u
,
MX_
EVENT_SIGNALED
)
!=
MX_OK
)
{
on_writes_committed
();
on_writes_committed
();
return
;
return
;
}
}
...
@@ -313,8 +313,8 @@ void VulkanSurface::SignalWritesFinished(
...
@@ -313,8 +313,8 @@ void VulkanSurface::SignalWritesFinished(
void
VulkanSurface
::
Reset
()
{
void
VulkanSurface
::
Reset
()
{
ASSERT_IS_GPU_THREAD
;
ASSERT_IS_GPU_THREAD
;
if
(
acquire_event_
.
signal
(
MX_
USER_SIGNAL_0
,
0u
)
!=
MX_OK
||
if
(
acquire_event_
.
signal
(
MX_
EVENT_SIGNALED
,
0u
)
!=
MX_OK
||
release_event_
.
signal
(
MX_
USER_SIGNAL_0
,
0u
)
!=
MX_OK
)
{
release_event_
.
signal
(
MX_
EVENT_SIGNALED
,
0u
)
!=
MX_OK
)
{
valid_
=
false
;
valid_
=
false
;
FTL_DLOG
(
ERROR
)
FTL_DLOG
(
ERROR
)
<<
"Could not reset fences. The surface is no longer valid."
;
<<
"Could not reset fences. The surface is no longer valid."
;
...
@@ -332,7 +332,7 @@ void VulkanSurface::OnHandleReady(mx_handle_t handle,
...
@@ -332,7 +332,7 @@ void VulkanSurface::OnHandleReady(mx_handle_t handle,
mx_signals_t
pending
,
mx_signals_t
pending
,
uint64_t
count
)
{
uint64_t
count
)
{
ASSERT_IS_GPU_THREAD
;
ASSERT_IS_GPU_THREAD
;
FTL_DCHECK
(
pending
&
MX_
USER_SIGNAL_0
);
FTL_DCHECK
(
pending
&
MX_
EVENT_SIGNALED
);
FTL_DCHECK
(
handle
==
release_event_
.
get
());
FTL_DCHECK
(
handle
==
release_event_
.
get
());
Reset
();
Reset
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录