Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
d495afc3
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,发现更多精彩内容 >>
未验证
提交
d495afc3
编写于
5月 23, 2019
作者:
J
Jim
提交者:
GitHub
5月 23, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1891 from jpark37/d3d-log-indices
libobs-d3d11: Bad indices in log output
上级
fa142ee6
6ac21c4b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
libobs-d3d11/d3d11-subsystem.cpp
libobs-d3d11/d3d11-subsystem.cpp
+7
-7
未找到文件。
libobs-d3d11/d3d11-subsystem.cpp
浏览文件 @
d495afc3
...
@@ -664,7 +664,7 @@ static inline void EnumD3DAdapters(
...
@@ -664,7 +664,7 @@ static inline void EnumD3DAdapters(
ComPtr
<
IDXGIFactory1
>
factory
;
ComPtr
<
IDXGIFactory1
>
factory
;
ComPtr
<
IDXGIAdapter1
>
adapter
;
ComPtr
<
IDXGIAdapter1
>
adapter
;
HRESULT
hr
;
HRESULT
hr
;
UINT
i
=
0
;
UINT
i
;
IID
factoryIID
=
(
GetWinVer
()
>=
0x602
)
?
dxgiFactory2
:
IID
factoryIID
=
(
GetWinVer
()
>=
0x602
)
?
dxgiFactory2
:
__uuidof
(
IDXGIFactory1
);
__uuidof
(
IDXGIFactory1
);
...
@@ -673,7 +673,7 @@ static inline void EnumD3DAdapters(
...
@@ -673,7 +673,7 @@ static inline void EnumD3DAdapters(
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
throw
HRError
(
"Failed to create DXGIFactory"
,
hr
);
throw
HRError
(
"Failed to create DXGIFactory"
,
hr
);
while
(
factory
->
EnumAdapters1
(
i
++
,
adapter
.
Assign
())
==
S_OK
)
{
for
(
i
=
0
;
factory
->
EnumAdapters1
(
i
,
adapter
.
Assign
())
==
S_OK
;
++
i
)
{
DXGI_ADAPTER_DESC
desc
;
DXGI_ADAPTER_DESC
desc
;
char
name
[
512
]
=
""
;
char
name
[
512
]
=
""
;
...
@@ -687,7 +687,7 @@ static inline void EnumD3DAdapters(
...
@@ -687,7 +687,7 @@ static inline void EnumD3DAdapters(
os_wcs_to_utf8
(
desc
.
Description
,
0
,
name
,
sizeof
(
name
));
os_wcs_to_utf8
(
desc
.
Description
,
0
,
name
,
sizeof
(
name
));
if
(
!
callback
(
param
,
name
,
i
-
1
))
if
(
!
callback
(
param
,
name
,
i
))
break
;
break
;
}
}
}
}
...
@@ -709,10 +709,10 @@ bool device_enum_adapters(
...
@@ -709,10 +709,10 @@ bool device_enum_adapters(
static
inline
void
LogAdapterMonitors
(
IDXGIAdapter1
*
adapter
)
static
inline
void
LogAdapterMonitors
(
IDXGIAdapter1
*
adapter
)
{
{
UINT
i
=
0
;
UINT
i
;
ComPtr
<
IDXGIOutput
>
output
;
ComPtr
<
IDXGIOutput
>
output
;
while
(
adapter
->
EnumOutputs
(
i
++
,
&
output
)
==
S_OK
)
{
for
(
i
=
0
;
adapter
->
EnumOutputs
(
i
,
&
output
)
==
S_OK
;
++
i
)
{
DXGI_OUTPUT_DESC
desc
;
DXGI_OUTPUT_DESC
desc
;
if
(
FAILED
(
output
->
GetDesc
(
&
desc
)))
if
(
FAILED
(
output
->
GetDesc
(
&
desc
)))
continue
;
continue
;
...
@@ -734,7 +734,7 @@ static inline void LogD3DAdapters()
...
@@ -734,7 +734,7 @@ static inline void LogD3DAdapters()
ComPtr
<
IDXGIFactory1
>
factory
;
ComPtr
<
IDXGIFactory1
>
factory
;
ComPtr
<
IDXGIAdapter1
>
adapter
;
ComPtr
<
IDXGIAdapter1
>
adapter
;
HRESULT
hr
;
HRESULT
hr
;
UINT
i
=
0
;
UINT
i
;
blog
(
LOG_INFO
,
"Available Video Adapters: "
);
blog
(
LOG_INFO
,
"Available Video Adapters: "
);
...
@@ -745,7 +745,7 @@ static inline void LogD3DAdapters()
...
@@ -745,7 +745,7 @@ static inline void LogD3DAdapters()
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
throw
HRError
(
"Failed to create DXGIFactory"
,
hr
);
throw
HRError
(
"Failed to create DXGIFactory"
,
hr
);
while
(
factory
->
EnumAdapters1
(
i
++
,
adapter
.
Assign
())
==
S_OK
)
{
for
(
i
=
0
;
factory
->
EnumAdapters1
(
i
,
adapter
.
Assign
())
==
S_OK
;
++
i
)
{
DXGI_ADAPTER_DESC
desc
;
DXGI_ADAPTER_DESC
desc
;
char
name
[
512
]
=
""
;
char
name
[
512
]
=
""
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录