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
d0548a8d
Commit
d0548a8d
authored
Dec 29, 2012
by
Adrien Maglo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaner way to define the GLSL version number as pointed out by funman.
parent
0dab579a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
20 deletions
+6
-20
modules/video_output/opengl.c
modules/video_output/opengl.c
+6
-20
No files found.
modules/video_output/opengl.c
View file @
d0548a8d
...
...
@@ -68,9 +68,11 @@
#endif
#if USE_OPENGL_ES
# define GLSL_VERSION "100"
# define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 1
#else
# define GLSL_VERSION "120"
# define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 128
#endif
...
...
@@ -191,11 +193,7 @@ static void BuildVertexShader(vout_display_opengl_t *vgl,
{
/* Basic vertex shader */
const
char
*
vertexShader
=
#if USE_OPENGL_ES == 2
"#version 100
\n
"
#else
"#version 120
\n
"
#endif
"#version "
GLSL_VERSION
"
\n
"
"varying vec4 TexCoord0,TexCoord1, TexCoord2;"
"attribute vec4 MultiTexCoord0,MultiTexCoord1,MultiTexCoord2;"
"attribute vec4 VertexPosition;"
...
...
@@ -238,11 +236,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl,
/* Basic linear YUV -> RGB conversion using bilinear interpolation */
const
char
*
template_glsl_yuv
=
#if USE_OPENGL_ES == 2
"#version 100
\n
"
#else
"#version 120
\n
"
#endif
"#version "
GLSL_VERSION
"
\n
"
"uniform sampler2D Texture0;"
"uniform sampler2D Texture1;"
"uniform sampler2D Texture2;"
...
...
@@ -292,11 +286,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
{
// Simple shader for RGB
const
char
*
code
=
#if USE_OPENGL_ES == 2
"#version 100
\n
"
#else
"#version 120
\n
"
#endif
"#version "
GLSL_VERSION
"
\n
"
"uniform sampler2D Texture[3];"
"varying vec4 TexCoord0,TexCoord1,TexCoord2;"
"void main()"
...
...
@@ -313,11 +303,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
{
// Simple shader for RGBA
const
char
*
code
=
#if USE_OPENGL_ES == 2
"#version 100
\n
"
#else
"#version 120
\n
"
#endif
"#version "
GLSL_VERSION
"
\n
"
"uniform sampler2D Texture;"
"uniform vec4 FillColor;"
"varying vec4 TexCoord0;"
...
...
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