Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
9fc46c6f
Commit
9fc46c6f
authored
Dec 19, 2018
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: avoid copying vd->info
parent
bc0bbb9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
modules/video_output/win32/direct3d9.c
modules/video_output/win32/direct3d9.c
+7
-9
No files found.
modules/video_output/win32/direct3d9.c
View file @
9fc46c6f
...
@@ -1700,11 +1700,11 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
...
@@ -1700,11 +1700,11 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
goto
error
;
goto
error
;
}
}
/* */
/*
Setup vout_display now that everything is fine
*/
v
out_display_info_t
info
=
vd
->
info
;
v
d
->
info
.
is_slow
=
!
is_d3d9_opaque
(
fmt
.
i_chroma
)
;
info
.
is_slow
=
!
is_d3d9_opaque
(
fmt
.
i_chroma
)
;
vd
->
info
.
has_double_click
=
true
;
info
.
has_
double_click
=
true
;
vd
->
info
.
has_
pictures_invalid
=
!
is_d3d9_opaque
(
fmt
.
i_chroma
)
;
info
.
has_pictures_invalid
=
!
is_d3d9_opaque
(
fmt
.
i_chroma
);
if
(
var_InheritBool
(
vd
,
"direct3d9-hw-blending"
)
&&
if
(
var_InheritBool
(
vd
,
"direct3d9-hw-blending"
)
&&
sys
->
d3dregion_format
!=
D3DFMT_UNKNOWN
&&
sys
->
d3dregion_format
!=
D3DFMT_UNKNOWN
&&
(
sys
->
d3d_dev
.
caps
.
SrcBlendCaps
&
D3DPBLENDCAPS_SRCALPHA
)
&&
(
sys
->
d3d_dev
.
caps
.
SrcBlendCaps
&
D3DPBLENDCAPS_SRCALPHA
)
&&
...
@@ -1712,9 +1712,9 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
...
@@ -1712,9 +1712,9 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
(
sys
->
d3d_dev
.
caps
.
TextureCaps
&
D3DPTEXTURECAPS_ALPHA
)
&&
(
sys
->
d3d_dev
.
caps
.
TextureCaps
&
D3DPTEXTURECAPS_ALPHA
)
&&
(
sys
->
d3d_dev
.
caps
.
TextureOpCaps
&
D3DTEXOPCAPS_SELECTARG1
)
&&
(
sys
->
d3d_dev
.
caps
.
TextureOpCaps
&
D3DTEXOPCAPS_SELECTARG1
)
&&
(
sys
->
d3d_dev
.
caps
.
TextureOpCaps
&
D3DTEXOPCAPS_MODULATE
))
(
sys
->
d3d_dev
.
caps
.
TextureOpCaps
&
D3DTEXOPCAPS_MODULATE
))
info
.
subpicture_chromas
=
d3d_subpicture_chromas
;
vd
->
info
.
subpicture_chromas
=
d3d_subpicture_chromas
;
else
else
info
.
subpicture_chromas
=
NULL
;
vd
->
info
.
subpicture_chromas
=
NULL
;
/* Interaction */
/* Interaction */
vlc_mutex_init
(
&
sys
->
lock
);
vlc_mutex_init
(
&
sys
->
lock
);
...
@@ -1724,10 +1724,8 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
...
@@ -1724,10 +1724,8 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
var_Change
(
vd
,
"video-wallpaper"
,
VLC_VAR_SETTEXT
,
_
(
"Desktop"
));
var_Change
(
vd
,
"video-wallpaper"
,
VLC_VAR_SETTEXT
,
_
(
"Desktop"
));
var_AddCallback
(
vd
,
"video-wallpaper"
,
DesktopCallback
,
NULL
);
var_AddCallback
(
vd
,
"video-wallpaper"
,
DesktopCallback
,
NULL
);
/* Setup vout_display now that everything is fine */
video_format_Clean
(
fmtp
);
video_format_Clean
(
fmtp
);
video_format_Copy
(
fmtp
,
&
fmt
);
video_format_Copy
(
fmtp
,
&
fmt
);
vd
->
info
=
info
;
vd
->
pool
=
DisplayPool
;
vd
->
pool
=
DisplayPool
;
vd
->
prepare
=
Prepare
;
vd
->
prepare
=
Prepare
;
...
...
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