Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
5d527f36
Commit
5d527f36
authored
May 25, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No functionnal changes (opengl).
parent
2a98d120
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
modules/video_output/opengl.c
modules/video_output/opengl.c
+13
-12
No files found.
modules/video_output/opengl.c
View file @
5d527f36
...
@@ -176,14 +176,6 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -176,14 +176,6 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
#endif
#endif
vgl
->
chroma
=
vlc_fourcc_GetChromaDescription
(
vgl
->
fmt
.
i_chroma
);
vgl
->
chroma
=
vlc_fourcc_GetChromaDescription
(
vgl
->
fmt
.
i_chroma
);
*
fmt
=
vgl
->
fmt
;
/* */
for
(
int
i
=
0
;
i
<
VLCGL_TEXTURE_COUNT
;
i
++
)
{
vgl
->
texture
[
i
]
=
0
;
vgl
->
buffer
[
i
]
=
NULL
;
}
vgl
->
pool
=
NULL
;
bool
supports_npot
=
false
;
bool
supports_npot
=
false
;
#if USE_OPENGL_ES == 2
#if USE_OPENGL_ES == 2
...
@@ -197,13 +189,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -197,13 +189,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
/* Texture size */
/* Texture size */
if
(
supports_npot
)
{
if
(
supports_npot
)
{
vgl
->
tex_width
=
fmt
->
i_width
;
vgl
->
tex_width
=
vgl
->
fmt
.
i_width
;
vgl
->
tex_height
=
fmt
->
i_height
;
vgl
->
tex_height
=
vgl
->
fmt
.
i_height
;
}
}
else
{
else
{
/* A texture must have a size aligned on a power of 2 */
/* A texture must have a size aligned on a power of 2 */
vgl
->
tex_width
=
GetAlignedSize
(
fmt
->
i_width
);
vgl
->
tex_width
=
GetAlignedSize
(
vgl
->
fmt
.
i_width
);
vgl
->
tex_height
=
GetAlignedSize
(
fmt
->
i_height
);
vgl
->
tex_height
=
GetAlignedSize
(
vgl
->
fmt
.
i_height
);
}
}
/* */
/* */
...
@@ -215,6 +207,15 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
...
@@ -215,6 +207,15 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
glClear
(
GL_COLOR_BUFFER_BIT
);
glClear
(
GL_COLOR_BUFFER_BIT
);
vlc_gl_Unlock
(
vgl
->
gl
);
vlc_gl_Unlock
(
vgl
->
gl
);
/* */
for
(
int
i
=
0
;
i
<
VLCGL_TEXTURE_COUNT
;
i
++
)
{
vgl
->
texture
[
i
]
=
0
;
vgl
->
buffer
[
i
]
=
NULL
;
}
vgl
->
pool
=
NULL
;
*
fmt
=
vgl
->
fmt
;
return
vgl
;
return
vgl
;
}
}
...
...
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