Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1dcc337d
Commit
1dcc337d
authored
Mar 24, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
D3D11: use defines for DXGI
parent
6fec817d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/video_output/msw/direct3d11.c
modules/video_output/msw/direct3d11.c
+6
-6
No files found.
modules/video_output/msw/direct3d11.c
View file @
1dcc337d
...
@@ -104,9 +104,9 @@ static void Direct3D11DestroyResources(vout_display_t *);
...
@@ -104,9 +104,9 @@ static void Direct3D11DestroyResources(vout_display_t *);
static
int
Direct3D11MapTexture
(
picture_t
*
);
static
int
Direct3D11MapTexture
(
picture_t
*
);
/* All the #if
0
contain an alternative method to setup dx11
/* All the #if
USE_DXGI
contain an alternative method to setup dx11
They both need to be benchmarked to see which performs better */
They both need to be benchmarked to see which performs better */
#if
0
#if
USE_DXGI
/* I have no idea why MS decided dxgi headers do not define this
/* I have no idea why MS decided dxgi headers do not define this
As they do have prototypes for d3d11 functions */
As they do have prototypes for d3d11 functions */
typedef
HRESULT
(
WINAPI
*
PFN_CREATE_DXGI_FACTORY
)(
REFIID
riid
,
void
**
ppFactory
);
typedef
HRESULT
(
WINAPI
*
PFN_CREATE_DXGI_FACTORY
)(
REFIID
riid
,
void
**
ppFactory
);
...
@@ -198,7 +198,7 @@ static int Open(vlc_object_t *object)
...
@@ -198,7 +198,7 @@ static int Open(vlc_object_t *object)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
# if
0
# if
USE_DXGI
HINSTANCE
hdxgi_dll
=
LoadLibrary
(
TEXT
(
"DXGI.DLL"
));
HINSTANCE
hdxgi_dll
=
LoadLibrary
(
TEXT
(
"DXGI.DLL"
));
if
(
!
hdxgi_dll
)
{
if
(
!
hdxgi_dll
)
{
msg_Warn
(
vd
,
"cannot load dxgi.dll, aborting"
);
msg_Warn
(
vd
,
"cannot load dxgi.dll, aborting"
);
...
@@ -233,7 +233,7 @@ static int Open(vlc_object_t *object)
...
@@ -233,7 +233,7 @@ static int Open(vlc_object_t *object)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
# if
0
# if
USE_DXGI
sys
->
hdxgi_dll
=
hdxgi_dll
;
sys
->
hdxgi_dll
=
hdxgi_dll
;
/* TODO : enable all dxgi versions from 1.3 -> 1.1 */
/* TODO : enable all dxgi versions from 1.3 -> 1.1 */
...
@@ -369,7 +369,7 @@ static void Direct3D11Destroy(vout_display_t *vd)
...
@@ -369,7 +369,7 @@ static void Direct3D11Destroy(vout_display_t *vd)
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
# if
0
# if
USE_DXGI
if
(
sys
->
hdxgi_dll
)
if
(
sys
->
hdxgi_dll
)
FreeLibrary
(
sys
->
hdxgi_dll
);
FreeLibrary
(
sys
->
hdxgi_dll
);
# endif
# endif
...
@@ -458,7 +458,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
...
@@ -458,7 +458,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
scd
.
OutputWindow
=
sys
->
hvideownd
;
scd
.
OutputWindow
=
sys
->
hvideownd
;
# endif
# endif
# if
0
# if
USE_DXGI
/* TODO : list adapters for the user to choose from */
/* TODO : list adapters for the user to choose from */
hr
=
IDXGIFactory_EnumAdapters
(
sys
->
dxgifactory
,
0
,
&
sys
->
dxgiadapter
);
hr
=
IDXGIFactory_EnumAdapters
(
sys
->
dxgifactory
,
0
,
&
sys
->
dxgiadapter
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment