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
e3f41a7e
Commit
e3f41a7e
authored
May 25, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made VLCGL_TEXTURE_COUNT private.
parent
32792812
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
modules/video_output/opengl.c
modules/video_output/opengl.c
+6
-0
modules/video_output/opengl.h
modules/video_output/opengl.h
+0
-4
No files found.
modules/video_output/opengl.c
View file @
e3f41a7e
...
@@ -76,6 +76,8 @@
...
@@ -76,6 +76,8 @@
# define VLCGL_FORMAT VLCGL_RGB_FORMAT
# define VLCGL_FORMAT VLCGL_RGB_FORMAT
# define VLCGL_TYPE VLCGL_RGB_TYPE
# define VLCGL_TYPE VLCGL_RGB_TYPE
# define VLCGL_TEXTURE_COUNT 1
#elif defined(MACOS_OPENGL)
#elif defined(MACOS_OPENGL)
/* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D.
/* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D.
...
@@ -86,6 +88,8 @@
...
@@ -86,6 +88,8 @@
# define VLCGL_FORMAT GL_YCBCR_422_APPLE
# define VLCGL_FORMAT GL_YCBCR_422_APPLE
# define VLCGL_TYPE GL_UNSIGNED_SHORT_8_8_APPLE
# define VLCGL_TYPE GL_UNSIGNED_SHORT_8_8_APPLE
# define VLCGL_TEXTURE_COUNT 2
#else
#else
# define VLCGL_TARGET GL_TEXTURE_2D
# define VLCGL_TARGET GL_TEXTURE_2D
...
@@ -101,6 +105,8 @@
...
@@ -101,6 +105,8 @@
/* Use RGB on Win32/GLX */
/* Use RGB on Win32/GLX */
# define VLCGL_FORMAT VLCGL_RGB_FORMAT
# define VLCGL_FORMAT VLCGL_RGB_FORMAT
# define VLCGL_TYPE VLCGL_RGB_TYPE
# define VLCGL_TYPE VLCGL_RGB_TYPE
# define VLCGL_TEXTURE_COUNT 1
#endif
#endif
struct
vout_display_opengl_t
{
struct
vout_display_opengl_t
{
...
...
modules/video_output/opengl.h
View file @
e3f41a7e
...
@@ -34,8 +34,6 @@
...
@@ -34,8 +34,6 @@
# define USE_OPENGL_ES 0
# define USE_OPENGL_ES 0
#endif
#endif
#define VLCGL_TEXTURE_COUNT 1
#if !defined (__APPLE__)
#if !defined (__APPLE__)
# if USE_OPENGL_ES == 2
# if USE_OPENGL_ES == 2
# include <GLES2/gl2.h>
# include <GLES2/gl2.h>
...
@@ -52,8 +50,6 @@
...
@@ -52,8 +50,6 @@
# else
# else
# define MACOS_OPENGL
# define MACOS_OPENGL
# include <OpenGL/gl.h>
# include <OpenGL/gl.h>
# undef VLCGL_TEXTURE_COUNT
# define VLCGL_TEXTURE_COUNT 2
# endif
# endif
#endif
#endif
...
...
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