mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

[409/906] gleffects: indent and fix some warnings in ES 2.0 mode

Browse source
This commit is contained in:
Julien Isorce 2009-11-25 10:24:37 +01:00 committed by Matthew Waters
parent e002f92e6d
commit ba4ca3bced
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gst/gl/gstgleffects.c
View file

@ -273,9 +273,9 @@ gst_gl_effects_class_init (GstGLEffectsClass * klass)
void
gst_gl_effects_draw_texture (GstGLEffects * effects, GLuint tex)
{
#ifndef OPENGL_ES2
GstGLFilter *filter = GST_GL_FILTER (effects);
#ifndef OPENGL_ES2
glActiveTexture (GL_TEXTURE0);
glEnable (GL_TEXTURE_RECTANGLE_ARB);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
@ -295,31 +295,31 @@ gst_gl_effects_draw_texture (GstGLEffects * effects, GLuint tex)
#else
const GLfloat vVertices[] = { -1.0f, -1.0f, 0.0f,
0.0f, 0.0f,
1.0, -1.0f, 0.0f,
1.0f, 0.0f,
1.0f, 1.0f, 0.0f,
1.0f, 1.0f,
-1.0f, 1.0f, 0.0f,
0.0f, 1.0f
};
0.0f, 0.0f,
1.0, -1.0f, 0.0f,
1.0f, 0.0f,
1.0f, 1.0f, 0.0f,
1.0f, 1.0f,
-1.0f, 1.0f, 0.0f,
0.0f, 1.0f
};
GLushort indices[] = { 0, 1, 2, 0, 2, 3 };
GLushort indices[] = { 0, 1, 2, 0, 2, 3 };
//glClear (GL_COLOR_BUFFER_BIT);
//glClear (GL_COLOR_BUFFER_BIT);
//Load the vertex position
glVertexAttribPointer (effects->draw_attr_position_loc, 3, GL_FLOAT,
GL_FALSE, 5 * sizeof (GLfloat), vVertices);
//Load the vertex position
glVertexAttribPointer (effects->draw_attr_position_loc, 3, GL_FLOAT,
GL_FALSE, 5 * sizeof (GLfloat), vVertices);
//Load the texture coordinate
glVertexAttribPointer (effects->draw_attr_texture_loc, 2, GL_FLOAT,
GL_FALSE, 5 * sizeof (GLfloat), &vVertices[3]);
//Load the texture coordinate
glVertexAttribPointer (effects->draw_attr_texture_loc, 2, GL_FLOAT,
GL_FALSE, 5 * sizeof (GLfloat), &vVertices[3]);
glEnableVertexAttribArray (effects->draw_attr_position_loc);
glEnableVertexAttribArray (effects->draw_attr_texture_loc);
glEnableVertexAttribArray (effects->draw_attr_position_loc);
glEnableVertexAttribArray (effects->draw_attr_texture_loc);
glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
#endif
}
@ -329,6 +329,7 @@ set_horizontal_swap (GstGLDisplay * display, gpointer data)
{
// GstGLEffects *effects = GST_GL_EFFECTS (data);
#ifndef OPENGL_ES2
const double mirrormatrix[16] = {
-1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
@ -336,7 +337,6 @@ set_horizontal_swap (GstGLDisplay * display, gpointer data)
0.0, 0.0, 0.0, 1.0
};
#ifndef OPENGL_ES2
glMatrixMode (GL_MODELVIEW);
glLoadMatrixd (mirrormatrix);
#endif