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
beeea72f
Commit
beeea72f
authored
Jun 16, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Jun 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
direct3d11: fix compilation when direct rendering cannot be used
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
d40efc28
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
modules/video_output/msw/direct3d11.c
modules/video_output/msw/direct3d11.c
+8
-1
No files found.
modules/video_output/msw/direct3d11.c
View file @
beeea72f
...
...
@@ -109,6 +109,7 @@ static const d3d_format_t d3d_formats[] = {
{
NULL
,
0
,
0
,
0
,
0
}
};
#ifdef HAVE_ID3D11VIDEODECODER
/* VLC_CODEC_D3D11_OPAQUE */
struct
picture_sys_t
{
...
...
@@ -116,6 +117,7 @@ struct picture_sys_t
ID3D11Texture2D
*
texture
;
ID3D11DeviceContext
*
context
;
};
#endif
/* internal picture_t pool */
typedef
struct
...
...
@@ -526,6 +528,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned pool_size)
if
(
vd
->
sys
->
pool
!=
NULL
)
return
vd
->
sys
->
pool
;
#ifdef HAVE_ID3D11VIDEODECODER
picture_t
**
pictures
=
NULL
;
unsigned
picture_count
=
0
;
HRESULT
hr
;
...
...
@@ -599,9 +602,11 @@ error:
DestroyDisplayPoolPicture
(
pictures
[
i
]);
free
(
pictures
);
}
#endif
return
vd
->
sys
->
pool
;
}
#ifdef HAVE_ID3D11VIDEODECODER
static
void
DestroyDisplayPoolPicture
(
picture_t
*
picture
)
{
picture_sys_t
*
p_sys
=
(
picture_sys_t
*
)
picture
->
p_sys
;
...
...
@@ -612,7 +617,7 @@ static void DestroyDisplayPoolPicture(picture_t *picture)
free
(
p_sys
);
free
(
picture
);
}
#endif
static
void
DestroyDisplayPicture
(
picture_t
*
picture
)
{
...
...
@@ -739,6 +744,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
#ifdef HAVE_ID3D11VIDEODECODER
if
(
picture
->
format
.
i_chroma
==
VLC_CODEC_D3D11_OPAQUE
)
{
D3D11_BOX
box
;
box
.
left
=
0
;
...
...
@@ -755,6 +761,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
(
ID3D11Resource
*
)
p_sys
->
texture
,
0
,
&
box
);
}
#endif
if
(
subpicture
)
{
int
subpicture_region_count
=
0
;
...
...
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