Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
e905b4cb
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e905b4cb
编写于
9月 01, 2020
作者:
J
jpark37
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
win-capture: Vulkan variable naming consistency
上级
6df30951
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
40 deletion
+39
-40
plugins/win-capture/graphics-hook/vulkan-capture.c
plugins/win-capture/graphics-hook/vulkan-capture.c
+39
-40
未找到文件。
plugins/win-capture/graphics-hook/vulkan-capture.c
浏览文件 @
e905b4cb
...
...
@@ -449,7 +449,7 @@ static void vk_shtex_free(struct vk_data *data)
/* ------------------------------------------------------------------------- */
static
void
add_surf_data
(
struct
vk_inst_data
*
data
,
VkSurfaceKHR
surf
,
static
void
add_surf_data
(
struct
vk_inst_data
*
i
data
,
VkSurfaceKHR
surf
,
HWND
hwnd
,
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_surf_data
*
surf_data
=
vk_alloc
(
...
...
@@ -458,22 +458,22 @@ static void add_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf,
if
(
surf_data
)
{
surf_data
->
hwnd
=
hwnd
;
add_obj_data
(
&
data
->
surfaces
,
(
uint64_t
)
surf
,
surf_data
);
add_obj_data
(
&
i
data
->
surfaces
,
(
uint64_t
)
surf
,
surf_data
);
}
}
static
HWND
find_surf_hwnd
(
struct
vk_inst_data
*
data
,
VkSurfaceKHR
surf
)
static
HWND
find_surf_hwnd
(
struct
vk_inst_data
*
i
data
,
VkSurfaceKHR
surf
)
{
struct
vk_surf_data
*
surf_data
=
(
struct
vk_surf_data
*
)
get_obj_data
(
&
data
->
surfaces
,
(
uint64_t
)
surf
);
&
i
data
->
surfaces
,
(
uint64_t
)
surf
);
return
surf_data
->
hwnd
;
}
static
void
remove_free_surf_data
(
struct
vk_inst_data
*
data
,
VkSurfaceKHR
surf
,
static
void
remove_free_surf_data
(
struct
vk_inst_data
*
i
data
,
VkSurfaceKHR
surf
,
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_surf_data
*
surf_data
=
(
struct
vk_surf_data
*
)
remove_obj_data
(
&
data
->
surfaces
,
(
uint64_t
)
surf
);
&
i
data
->
surfaces
,
(
uint64_t
)
surf
);
vk_free
(
ac
,
surf_data
);
}
...
...
@@ -483,10 +483,10 @@ static struct vk_obj_list instances;
static
struct
vk_inst_data
*
alloc_inst_data
(
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_inst_data
*
i
nst_
data
=
vk_alloc
(
struct
vk_inst_data
*
idata
=
vk_alloc
(
ac
,
sizeof
(
struct
vk_inst_data
),
_Alignof
(
struct
vk_inst_data
),
VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE
);
return
i
nst_
data
;
return
idata
;
}
static
void
init_inst_data
(
struct
vk_inst_data
*
data
,
VkInstance
inst
)
...
...
@@ -502,9 +502,8 @@ static struct vk_inst_data *get_inst_data(VkInstance inst)
static
struct
vk_inst_funcs
*
get_inst_funcs
(
VkInstance
inst
)
{
struct
vk_inst_data
*
inst_data
=
(
struct
vk_inst_data
*
)
get_inst_data
(
inst
);
return
&
inst_data
->
funcs
;
struct
vk_inst_data
*
idata
=
(
struct
vk_inst_data
*
)
get_inst_data
(
inst
);
return
&
idata
->
funcs
;
}
static
struct
vk_inst_data
*
...
...
@@ -517,18 +516,18 @@ get_inst_data_by_physical_device(VkPhysicalDevice physicalDevice)
static
struct
vk_inst_funcs
*
get_inst_funcs_by_physical_device
(
VkPhysicalDevice
physicalDevice
)
{
struct
vk_inst_data
*
i
nst_
data
=
struct
vk_inst_data
*
idata
=
(
struct
vk_inst_data
*
)
get_inst_data_by_physical_device
(
physicalDevice
);
return
&
i
nst_
data
->
funcs
;
return
&
idata
->
funcs
;
}
static
void
remove_free_inst_data
(
VkInstance
inst
,
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_inst_data
*
i
nst_
data
=
(
struct
vk_inst_data
*
)
remove_obj_data
(
struct
vk_inst_data
*
idata
=
(
struct
vk_inst_data
*
)
remove_obj_data
(
&
instances
,
(
uint64_t
)
GET_LDT
(
inst
));
vk_free
(
ac
,
i
nst_
data
);
vk_free
(
ac
,
idata
);
}
/* ======================================================================== */
...
...
@@ -1273,8 +1272,8 @@ static VkResult VKAPI_CALL OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
/* -------------------------------------------------------- */
/* allocate data node */
struct
vk_inst_data
*
data
=
alloc_inst_data
(
ac
);
if
(
!
data
)
struct
vk_inst_data
*
i
data
=
alloc_inst_data
(
ac
);
if
(
!
i
data
)
return
VK_ERROR_OUT_OF_HOST_MEMORY
;
/* -------------------------------------------------------- */
...
...
@@ -1284,26 +1283,26 @@ static VkResult VKAPI_CALL OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
VkResult
res
=
create
(
&
info
,
ac
,
p_inst
);
if
(
res
!=
VK_SUCCESS
)
{
vk_free
(
ac
,
data
);
vk_free
(
ac
,
i
data
);
return
res
;
}
VkInstance
inst
=
*
p_inst
;
init_inst_data
(
data
,
inst
);
init_inst_data
(
i
data
,
inst
);
/* -------------------------------------------------------- */
/* fetch the functions we need */
struct
vk_inst_funcs
*
funcs
=
&
data
->
funcs
;
struct
vk_inst_funcs
*
ifuncs
=
&
i
data
->
funcs
;
#define GETADDR(x) \
do { \
funcs->x = (void *)gpa(inst, "vk" #x); \
if (!funcs->x) { \
flog("could not get instance " \
"address for vk" #x); \
funcs_not_found = true; \
} \
#define GETADDR(x)
\
do {
\
i
funcs->x = (void *)gpa(inst, "vk" #x); \
if (!
i
funcs->x) { \
flog("could not get instance "
\
"address for vk" #x);
\
funcs_not_found = true;
\
}
\
} while (false)
GETADDR
(
GetInstanceProcAddr
);
...
...
@@ -1316,9 +1315,9 @@ static VkResult VKAPI_CALL OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
GETADDR
(
EnumerateDeviceExtensionProperties
);
#undef GETADDR
init_obj_list
(
&
data
->
surfaces
);
init_obj_list
(
&
i
data
->
surfaces
);
data
->
valid
=
!
funcs_not_found
;
i
data
->
valid
=
!
funcs_not_found
;
return
res
;
}
...
...
@@ -1326,8 +1325,8 @@ static VkResult VKAPI_CALL OBS_CreateInstance(const VkInstanceCreateInfo *cinfo,
static
void
VKAPI_CALL
OBS_DestroyInstance
(
VkInstance
instance
,
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_inst_funcs
*
funcs
=
get_inst_funcs
(
instance
);
PFN_vkDestroyInstance
destroy_instance
=
funcs
->
DestroyInstance
;
struct
vk_inst_funcs
*
i
funcs
=
get_inst_funcs
(
instance
);
PFN_vkDestroyInstance
destroy_instance
=
i
funcs
->
DestroyInstance
;
remove_free_inst_data
(
instance
,
ac
);
...
...
@@ -1705,24 +1704,24 @@ static VkResult VKAPI_CALL OBS_CreateWin32SurfaceKHR(
VkInstance
inst
,
const
VkWin32SurfaceCreateInfoKHR
*
info
,
const
VkAllocationCallbacks
*
ac
,
VkSurfaceKHR
*
surf
)
{
struct
vk_inst_data
*
data
=
get_inst_data
(
inst
);
struct
vk_inst_funcs
*
funcs
=
&
data
->
funcs
;
struct
vk_inst_data
*
i
data
=
get_inst_data
(
inst
);
struct
vk_inst_funcs
*
ifuncs
=
&
i
data
->
funcs
;
VkResult
res
=
funcs
->
CreateWin32SurfaceKHR
(
inst
,
info
,
ac
,
surf
);
VkResult
res
=
i
funcs
->
CreateWin32SurfaceKHR
(
inst
,
info
,
ac
,
surf
);
if
(
res
==
VK_SUCCESS
)
add_surf_data
(
data
,
*
surf
,
info
->
hwnd
,
ac
);
add_surf_data
(
i
data
,
*
surf
,
info
->
hwnd
,
ac
);
return
res
;
}
static
void
VKAPI_CALL
OBS_DestroySurfaceKHR
(
VkInstance
inst
,
VkSurfaceKHR
surf
,
const
VkAllocationCallbacks
*
ac
)
{
struct
vk_inst_data
*
data
=
get_inst_data
(
inst
);
struct
vk_inst_funcs
*
funcs
=
&
data
->
funcs
;
PFN_vkDestroySurfaceKHR
destroy_surface
=
funcs
->
DestroySurfaceKHR
;
struct
vk_inst_data
*
i
data
=
get_inst_data
(
inst
);
struct
vk_inst_funcs
*
ifuncs
=
&
i
data
->
funcs
;
PFN_vkDestroySurfaceKHR
destroy_surface
=
i
funcs
->
DestroySurfaceKHR
;
if
(
surf
!=
VK_NULL_HANDLE
)
remove_free_surf_data
(
data
,
surf
,
ac
);
remove_free_surf_data
(
i
data
,
surf
,
ac
);
destroy_surface
(
inst
,
surf
,
ac
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录