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
d08d960c
Commit
d08d960c
authored
Jan 23, 2009
by
Kaarlo Raiha
Committed by
Jean-Baptiste Kempf
Jan 23, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unneeded code
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
4536532e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
15 deletions
+7
-15
modules/video_output/msw/direct3d.c
modules/video_output/msw/direct3d.c
+7
-15
No files found.
modules/video_output/msw/direct3d.c
View file @
d08d960c
...
@@ -743,7 +743,7 @@ static void Direct3DVoutClose( vout_thread_t *p_vout )
...
@@ -743,7 +743,7 @@ static void Direct3DVoutClose( vout_thread_t *p_vout )
IDirect3DDevice9_Release
(
p_vout
->
p_sys
->
p_d3ddev
);
IDirect3DDevice9_Release
(
p_vout
->
p_sys
->
p_d3ddev
);
p_vout
->
p_sys
->
p_d3ddev
=
NULL
;
p_vout
->
p_sys
->
p_d3ddev
=
NULL
;
}
}
p_vout
->
p_sys
->
hmonitor
=
NULL
;
p_vout
->
p_sys
->
hmonitor
=
NULL
;
}
}
...
@@ -1041,7 +1041,7 @@ static int Direct3DVoutCreatePictures( vout_thread_t *p_vout, size_t i_num_pics
...
@@ -1041,7 +1041,7 @@ static int Direct3DVoutCreatePictures( vout_thread_t *p_vout, size_t i_num_pics
/* fill surface with black color */
/* fill surface with black color */
IDirect3DDevice9_ColorFill
(
p_d3ddev
,
p_d3dsurf
,
NULL
,
D3DCOLOR_ARGB
(
0xFF
,
0
,
0
,
0
)
);
IDirect3DDevice9_ColorFill
(
p_d3ddev
,
p_d3dsurf
,
NULL
,
D3DCOLOR_ARGB
(
0xFF
,
0
,
0
,
0
)
);
/* assign surface to internal structure */
/* assign surface to internal structure */
p_pic
->
p_sys
=
(
void
*
)
p_d3dsurf
;
p_pic
->
p_sys
=
(
void
*
)
p_d3dsurf
;
...
@@ -1397,7 +1397,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1397,7 +1397,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
p_vertices
[
0
].
rhw
=
1
.
0
f
;
p_vertices
[
0
].
rhw
=
1
.
0
f
;
p_vertices
[
0
].
tu
=
0
.
0
f
;
p_vertices
[
0
].
tu
=
0
.
0
f
;
p_vertices
[
0
].
tv
=
0
.
0
f
;
p_vertices
[
0
].
tv
=
0
.
0
f
;
p_vertices
[
1
].
x
=
f_width
;
// right
p_vertices
[
1
].
x
=
f_width
;
// right
p_vertices
[
1
].
y
=
0
.
0
f
;
// top
p_vertices
[
1
].
y
=
0
.
0
f
;
// top
p_vertices
[
1
].
z
=
0
.
0
f
;
p_vertices
[
1
].
z
=
0
.
0
f
;
...
@@ -1405,7 +1405,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1405,7 +1405,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
p_vertices
[
1
].
rhw
=
1
.
0
f
;
p_vertices
[
1
].
rhw
=
1
.
0
f
;
p_vertices
[
1
].
tu
=
1
.
0
f
;
p_vertices
[
1
].
tu
=
1
.
0
f
;
p_vertices
[
1
].
tv
=
0
.
0
f
;
p_vertices
[
1
].
tv
=
0
.
0
f
;
p_vertices
[
2
].
x
=
f_width
;
// right
p_vertices
[
2
].
x
=
f_width
;
// right
p_vertices
[
2
].
y
=
f_height
;
// bottom
p_vertices
[
2
].
y
=
f_height
;
// bottom
p_vertices
[
2
].
z
=
0
.
0
f
;
p_vertices
[
2
].
z
=
0
.
0
f
;
...
@@ -1413,7 +1413,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1413,7 +1413,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
p_vertices
[
2
].
rhw
=
1
.
0
f
;
p_vertices
[
2
].
rhw
=
1
.
0
f
;
p_vertices
[
2
].
tu
=
1
.
0
f
;
p_vertices
[
2
].
tu
=
1
.
0
f
;
p_vertices
[
2
].
tv
=
1
.
0
f
;
p_vertices
[
2
].
tv
=
1
.
0
f
;
p_vertices
[
3
].
x
=
0
.
0
f
;
// left
p_vertices
[
3
].
x
=
0
.
0
f
;
// left
p_vertices
[
3
].
y
=
f_height
;
// bottom
p_vertices
[
3
].
y
=
f_height
;
// bottom
p_vertices
[
3
].
z
=
0
.
0
f
;
p_vertices
[
3
].
z
=
0
.
0
f
;
...
@@ -1421,7 +1421,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1421,7 +1421,7 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
p_vertices
[
3
].
rhw
=
1
.
0
f
;
p_vertices
[
3
].
rhw
=
1
.
0
f
;
p_vertices
[
3
].
tu
=
0
.
0
f
;
p_vertices
[
3
].
tu
=
0
.
0
f
;
p_vertices
[
3
].
tv
=
1
.
0
f
;
p_vertices
[
3
].
tv
=
1
.
0
f
;
hr
=
IDirect3DVertexBuffer9_Unlock
(
p_d3dvtc
);
hr
=
IDirect3DVertexBuffer9_Unlock
(
p_d3dvtc
);
if
(
FAILED
(
hr
)
)
if
(
FAILED
(
hr
)
)
{
{
...
@@ -1457,16 +1457,8 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -1457,16 +1457,8 @@ static void Direct3DVoutRenderScene( vout_thread_t *p_vout, picture_t *p_pic )
IDirect3DDevice9_EndScene
(
p_d3ddev
);
IDirect3DDevice9_EndScene
(
p_d3ddev
);
return
;
return
;
}
}
// we use FVF instead of vertex shader
hr
=
IDirect3DDevice9_SetVertexShader
(
p_d3ddev
,
NULL
);
if
(
FAILED
(
hr
)
)
{
msg_Dbg
(
p_vout
,
"%s:%d (hr=0x%0lX)"
,
__FUNCTION__
,
__LINE__
,
hr
);
IDirect3DDevice9_EndScene
(
p_d3ddev
);
return
;
}
// we use FVF instead of vertex shader
hr
=
IDirect3DDevice9_SetFVF
(
p_d3ddev
,
D3DFVF_CUSTOMVERTEX
);
hr
=
IDirect3DDevice9_SetFVF
(
p_d3ddev
,
D3DFVF_CUSTOMVERTEX
);
if
(
FAILED
(
hr
)
)
if
(
FAILED
(
hr
)
)
{
{
...
...
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