/*****************************************************************************
* opengl.c: OpenGL and OpenGL ES output common code
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
- * Copyright (C) 2009 Laurent Aimar
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
+ * Copyright (C) 2009, 2011 Laurent Aimar
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
#include <vlc_common.h>
#include <vlc_picture_pool.h>
+#include <vlc_subpicture.h>
#include <vlc_opengl.h>
#include "opengl.h"
// Define USE_OPENGL_ES to the GL ES Version you want to select
-#if !defined (__APPLE__)
-# if USE_OPENGL_ES == 2
-# include <GLES2/gl2ext.h>
-# elif USE_OPENGL_ES == 1
-# include <GLES/glext.h>
-# else
-# include <GL/glext.h>
-# endif
-#else
-# if USE_OPENGL_ES == 2
-# include <OpenGLES/ES2/gl.h>
-# elif USE_OPENGL_ES == 1
-# include <OpenGLES/ES1/gl.h>
-# else
-# define MACOS_OPENGL
-# include <OpenGL/glext.h>
-# endif
+#ifdef __APPLE__
+# define PFNGLGENPROGRAMSARBPROC typeof(glGenProgramsARB)*
+# define PFNGLBINDPROGRAMARBPROC typeof(glBindProgramARB)*
+# define PFNGLPROGRAMSTRINGARBPROC typeof(glProgramStringARB)*
+# define PFNGLDELETEPROGRAMSARBPROC typeof(glDeleteProgramsARB)*
+# define PFNGLPROGRAMLOCALPARAMETER4FVARBPROC typeof(glProgramLocalParameter4fvARB)*
+# define PFNGLACTIVETEXTUREARBPROC typeof(glActiveTextureARB)*
+# define PFNGLMULTITEXCOORD2FARBPROC typeof(glMultiTexCoord2fARB)*
#endif
/* RV16 */
#if USE_OPENGL_ES
# define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 1
-#elif defined(MACOS_OPENGL)
-# define VLCGL_TEXTURE_COUNT 2
-# define VLCGL_PICTURE_MAX 2
#else
# define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 128
#endif
+static const vlc_fourcc_t gl_subpicture_chromas[] = {
+ VLC_CODEC_RGBA,
+ 0
+};
+
+typedef struct {
+ GLuint texture;
+ unsigned format;
+ unsigned type;
+ unsigned width;
+ unsigned height;
+
+ float alpha;
+
+ float top;
+ float left;
+ float bottom;
+ float right;
+} gl_region_t;
+
struct vout_display_opengl_t {
vlc_gl_t *gl;
int tex_target;
int tex_format;
+ int tex_internal;
int tex_type;
int tex_width[PICTURE_PLANE_MAX];
GLuint texture[VLCGL_TEXTURE_COUNT][PICTURE_PLANE_MAX];
+ int region_count;
+ gl_region_t *region;
+
+
picture_pool_t *pool;
GLuint program;
GLfloat local_value[16][4];
/* fragment_program */
- void (*GenProgramsARB)(GLsizei, GLuint *);
- void (*BindProgramARB)(GLenum, GLuint);
- void (*ProgramStringARB)(GLenum, GLenum, GLsizei, const GLvoid *);
- void (*DeleteProgramsARB)(GLsizei, const GLuint *);
- void (*ProgramLocalParameter4fvARB)(GLenum, GLuint, const GLfloat *);
+ PFNGLGENPROGRAMSARBPROC GenProgramsARB;
+ PFNGLBINDPROGRAMARBPROC BindProgramARB;
+ PFNGLPROGRAMSTRINGARBPROC ProgramStringARB;
+ PFNGLDELETEPROGRAMSARBPROC DeleteProgramsARB;
+ PFNGLPROGRAMLOCALPARAMETER4FVARBPROC ProgramLocalParameter4fvARB;
/* multitexture */
- void (*ActiveTextureARB)(GLenum);
- void (*MultiTexCoord2fARB)(GLenum, GLfloat, GLfloat);
+ bool use_multitexture;
+ PFNGLACTIVETEXTUREARBPROC ActiveTextureARB;
+ PFNGLMULTITEXCOORD2FARBPROC MultiTexCoord2fARB;
};
static inline int GetAlignedSize(unsigned size)
return ((align >> 1) == size) ? size : align;
}
+static bool IsLuminance16Supported(int target)
+{
+ GLuint texture;
+
+ glGenTextures(1, &texture);
+ glBindTexture(target, texture);
+ glTexImage2D(target, 0, GL_LUMINANCE16,
+ 64, 64, 0, GL_LUMINANCE, GL_UNSIGNED_SHORT, NULL);
+ GLint size = 0;
+ glGetTexLevelParameteriv(target, 0, GL_TEXTURE_LUMINANCE_SIZE, &size);
+
+ glDeleteTextures(1, &texture);
+
+ return size == 16;
+}
+
vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
const vlc_fourcc_t **subpicture_chromas,
vlc_gl_t *gl)
}
const char *extensions = (const char *)glGetString(GL_EXTENSIONS);
- if (!extensions)
- extensions = "";
/* Load extensions */
bool supports_fp = false;
- if (strstr(extensions, "GL_ARB_fragment_program")) {
- vgl->GenProgramsARB = (void (*)(GLsizei, GLuint *))vlc_gl_GetProcAddress(vgl->gl, "glGenProgramsARB");
- vgl->BindProgramARB = (void (*)(GLenum, GLuint))vlc_gl_GetProcAddress(vgl->gl, "glBindProgramARB");
- vgl->ProgramStringARB = (void (*)(GLenum, GLenum, GLsizei, const GLvoid *))vlc_gl_GetProcAddress(vgl->gl, "glProgramStringARB");
- vgl->DeleteProgramsARB = (void (*)(GLsizei, const GLuint *))vlc_gl_GetProcAddress(vgl->gl, "glDeleteProgramsARB");
- vgl->ProgramLocalParameter4fvARB = (void (*)(GLenum, GLuint, const GLfloat *))vlc_gl_GetProcAddress(vgl->gl, "glProgramLocalParameter4fvARB");
-
+ if (HasExtension(extensions, "GL_ARB_fragment_program")) {
+#if !defined(MACOS_OPENGL)
+ vgl->GenProgramsARB = (PFNGLGENPROGRAMSARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glGenProgramsARB");
+ vgl->BindProgramARB = (PFNGLBINDPROGRAMARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glBindProgramARB");
+ vgl->ProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glProgramStringARB");
+ vgl->DeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glDeleteProgramsARB");
+ vgl->ProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glProgramLocalParameter4fvARB");
+#else
+ vgl->GenProgramsARB = glGenProgramsARB;
+ vgl->BindProgramARB = glBindProgramARB;
+ vgl->ProgramStringARB = glProgramStringARB;
+ vgl->DeleteProgramsARB = glDeleteProgramsARB;
+ vgl->ProgramLocalParameter4fvARB = glProgramLocalParameter4fvARB;
+#endif
supports_fp = vgl->GenProgramsARB &&
vgl->BindProgramARB &&
vgl->ProgramStringARB &&
vgl->DeleteProgramsARB &&
vgl->ProgramLocalParameter4fvARB;
}
- bool supports_multitexture = false;
- if (strstr(extensions, "GL_ARB_multitexture")) {
- vgl->ActiveTextureARB = (void (*)(GLenum))vlc_gl_GetProcAddress(vgl->gl, "glActiveTextureARB");
- vgl->MultiTexCoord2fARB = (void (*)(GLenum, GLfloat, GLfloat))vlc_gl_GetProcAddress(vgl->gl, "glMultiTexCoord2fARB");
+ bool supports_multitexture = false;
+ GLint max_texture_units = 0;
+ if (HasExtension(extensions, "GL_ARB_multitexture")) {
+#if !defined(MACOS_OPENGL)
+ vgl->ActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glActiveTextureARB");
+ vgl->MultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)vlc_gl_GetProcAddress(vgl->gl, "glMultiTexCoord2fARB");
+#else
+ vgl->ActiveTextureARB = glActiveTextureARB;
+ vgl->MultiTexCoord2fARB = glMultiTexCoord2fARB;
+#endif
supports_multitexture = vgl->ActiveTextureARB &&
vgl->MultiTexCoord2fARB;
+ if (supports_multitexture)
+ glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max_texture_units);
}
/* Initialize with default chroma */
# endif
vgl->tex_target = GL_TEXTURE_2D;
vgl->tex_format = GL_RGB;
+ vgl->tex_internal = GL_RGB;
vgl->tex_type = GL_UNSIGNED_SHORT_5_6_5;
-#elif defined(MACOS_OPENGL)
-# if defined(WORDS_BIGENDIAN)
- vgl->fmt.i_chroma = VLC_CODEC_YUYV;
-# else
- vgl->fmt.i_chroma = VLC_CODEC_UYVY;
-# endif
- vgl->tex_target = GL_TEXTURE_RECTANGLE_EXT;
- vgl->tex_format = GL_YCBCR_422_APPLE;
- vgl->tex_type = GL_UNSIGNED_SHORT_8_8_APPLE;
#else
vgl->fmt.i_chroma = VLC_CODEC_RGB32;
# if defined(WORDS_BIGENDIAN)
# endif
vgl->tex_target = GL_TEXTURE_2D;
vgl->tex_format = GL_RGBA;
+ vgl->tex_internal = GL_RGBA;
vgl->tex_type = GL_UNSIGNED_BYTE;
#endif
/* Use YUV if possible and needed */
bool need_fs_yuv = false;
- if (supports_fp && supports_multitexture &&
+ float yuv_range_correction = 1.0;
+ if (supports_fp && supports_multitexture && max_texture_units >= 3 &&
vlc_fourcc_IsYUV(fmt->i_chroma) && !vlc_fourcc_IsYUV(vgl->fmt.i_chroma)) {
const vlc_fourcc_t *list = vlc_fourcc_GetYUVFallback(fmt->i_chroma);
while (*list) {
vgl->fmt = *fmt;
vgl->fmt.i_chroma = *list;
vgl->tex_format = GL_LUMINANCE;
+ vgl->tex_internal = GL_LUMINANCE;
vgl->tex_type = GL_UNSIGNED_BYTE;
+ yuv_range_correction = 1.0;
+ break;
+ } else if (dsc && dsc->plane_count == 3 && dsc->pixel_size == 2 &&
+ IsLuminance16Supported(vgl->tex_target)) {
+ need_fs_yuv = true;
+ vgl->fmt = *fmt;
+ vgl->fmt.i_chroma = *list;
+ vgl->tex_format = GL_LUMINANCE;
+ vgl->tex_internal = GL_LUMINANCE16;
+ vgl->tex_type = GL_UNSIGNED_SHORT;
+ yuv_range_correction = (float)((1 << 16) - 1) / ((1 << dsc->pixel_bits) - 1);
break;
}
list++;
}
vgl->chroma = vlc_fourcc_GetChromaDescription(vgl->fmt.i_chroma);
+ vgl->use_multitexture = vgl->chroma->plane_count > 1;
bool supports_npot = false;
#if USE_OPENGL_ES == 2
supports_npot = true;
-#elif defined(MACOS_OPENGL)
- supports_npot = true;
#else
- supports_npot |= strstr(extensions, "GL_APPLE_texture_2D_limited_npot") != NULL ||
- strstr(extensions, "GL_ARB_texture_non_power_of_two");
+ supports_npot |= HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot") ||
+ HasExtension(extensions, "GL_ARB_texture_non_power_of_two");
#endif
- /* Texture size
- * TODO calculate the size such that the pictures can be used as
- * direct buffers
- */
+ /* Texture size */
for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
int w = vgl->fmt.i_width * vgl->chroma->p[j].w.num / vgl->chroma->p[j].w.den;
int h = vgl->fmt.i_height * vgl->chroma->p[j].h.num / vgl->chroma->p[j].h.den;
swap_uv ? 'y' : 'z') < 0)
code = NULL;
- for (int i = 0; i < 4; i++)
- for (int j = 0; j < 4; j++)
- vgl->local_value[vgl->local_count + i][j] = j < 3 ? matrix[j][i] : 0.0;
+ for (int i = 0; i < 4; i++) {
+ float correction = i < 3 ? yuv_range_correction : 1.0;
+ for (int j = 0; j < 4; j++) {
+ vgl->local_value[vgl->local_count + i][j] = j < 3 ? correction * matrix[j][i] : 0.0;
+ }
+ }
vgl->local_count += 4;
}
if (code) {
+ // Here you have shaders
vgl->GenProgramsARB(1, &vgl->program);
vgl->BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, vgl->program);
vgl->ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,
for (int j = 0; j < PICTURE_PLANE_MAX; j++)
vgl->texture[i][j] = 0;
}
+ vgl->region_count = 0;
+ vgl->region = NULL;
vgl->pool = NULL;
*fmt = vgl->fmt;
if (subpicture_chromas) {
*subpicture_chromas = NULL;
+#if !USE_OPENGL_ES
+ if (supports_npot)
+ *subpicture_chromas = gl_subpicture_chromas;
+#endif
}
return vgl;
}
glFlush();
for (int i = 0; i < VLCGL_TEXTURE_COUNT; i++)
glDeleteTextures(vgl->chroma->plane_count, vgl->texture[i]);
+ for (int i = 0; i < vgl->region_count; i++) {
+ if (vgl->region[i].texture)
+ glDeleteTextures(1, &vgl->region[i].texture);
+ }
+ free(vgl->region);
if (vgl->program)
vgl->DeleteProgramsARB(1, &vgl->program);
free(vgl);
}
-#ifdef MACOS_OPENGL
-struct picture_sys_t {
- vout_display_opengl_t *vgl;
- GLuint *texture;
-};
-
-/* Small helper */
-static inline GLuint PictureGetTexture(picture_t *picture)
-{
- return *picture->p_sys->texture;
-}
-
-static int PictureLock(picture_t *picture)
-{
- if (!picture->p_sys)
- return VLC_SUCCESS;
-
- vout_display_opengl_t *vgl = picture->p_sys->vgl;
- if (!vlc_gl_Lock(vgl->gl)) {
- glBindTexture(vgl->tex_target, PictureGetTexture(picture));
- glTexSubImage2D(vgl->tex_target, 0,
- 0, 0, vgl->fmt.i_width, vgl->fmt.i_height,
- vgl->tex_format, vgl->tex_type, picture->p[0].p_pixels);
-
- vlc_gl_Unlock(vgl->gl);
- }
- return VLC_SUCCESS;
-}
-
-static void PictureUnlock(picture_t *picture)
-{
- VLC_UNUSED(picture);
-}
-#endif
-
picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned requested_count)
{
if (vgl->pool)
picture[count] = picture_NewFromFormat(&vgl->fmt);
if (!picture[count])
break;
-
-#ifdef MACOS_OPENGL
- picture_sys_t *sys = picture[count]->p_sys = malloc(sizeof(*sys));
- if (sys) {
- sys->vgl = vgl;
- sys->texture = vgl->texture[count];
- }
-#endif
}
if (count <= 0)
return NULL;
memset(&cfg, 0, sizeof(cfg));
cfg.picture_count = count;
cfg.picture = picture;
-#ifdef MACOS_OPENGL
- cfg.lock = PictureLock;
- cfg.unlock = PictureUnlock;
-#endif
vgl->pool = picture_pool_NewExtended(&cfg);
if (!vgl->pool)
goto error;
for (int i = 0; i < VLCGL_TEXTURE_COUNT; i++) {
glGenTextures(vgl->chroma->plane_count, vgl->texture[i]);
for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
- if (vgl->chroma->plane_count > 1)
+ if (vgl->use_multitexture)
vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);
glBindTexture(vgl->tex_target, vgl->texture[i][j]);
glTexParameteri(vgl->tex_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(vgl->tex_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-#ifdef MACOS_OPENGL
- /* Tell the driver not to make a copy of the texture but to use
- our buffer */
- glEnable(GL_UNPACK_CLIENT_STORAGE_APPLE);
- glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
-
-#if 0
- /* Use VRAM texturing */
- glTexParameteri(vgl->tex_target, GL_TEXTURE_STORAGE_HINT_APPLE,
- GL_STORAGE_CACHED_APPLE);
-#else
- /* Use AGP texturing */
- glTexParameteri(vgl->tex_target, GL_TEXTURE_STORAGE_HINT_APPLE,
- GL_STORAGE_SHARED_APPLE);
-#endif
-#endif
-
/* Call glTexImage2D only once, and use glTexSubImage2D later */
glTexImage2D(vgl->tex_target, 0,
- vgl->tex_format, vgl->tex_width[j], vgl->tex_height[j],
+ vgl->tex_internal, vgl->tex_width[j], vgl->tex_height[j],
0, vgl->tex_format, vgl->tex_type, NULL);
}
}
if (vlc_gl_Lock(vgl->gl))
return VLC_EGENERIC;
-#ifdef MACOS_OPENGL
- /* Bind to the texture for drawing */
- glBindTexture(vgl->tex_target, PictureGetTexture(picture));
-#else
/* Update the texture */
for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
- if (vgl->chroma->plane_count > 1)
+ const int plane = vgl->fmt.i_chroma == VLC_CODEC_YV12 && j > 0 ? (3 - j) : j;
+ if (vgl->use_multitexture)
vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);
glBindTexture(vgl->tex_target, vgl->texture[0][j]);
- glPixelStorei(GL_UNPACK_ROW_LENGTH, picture->p[j].i_pitch / picture->p[j].i_pixel_pitch);
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, picture->p[plane].i_pitch / picture->p[plane].i_pixel_pitch);
glTexSubImage2D(vgl->tex_target, 0,
0, 0,
- vgl->fmt.i_width * vgl->chroma->p[j].w.num / vgl->chroma->p[j].w.den,
- vgl->fmt.i_height * vgl->chroma->p[j].h.num / vgl->chroma->p[j].h.den,
- vgl->tex_format, vgl->tex_type, picture->p[j].p_pixels);
+ vgl->fmt.i_width * vgl->chroma->p[plane].w.num / vgl->chroma->p[plane].w.den,
+ vgl->fmt.i_height * vgl->chroma->p[plane].h.num / vgl->chroma->p[plane].h.den,
+ vgl->tex_format, vgl->tex_type, picture->p[plane].p_pixels);
}
-#endif
+
+ int last_count = vgl->region_count;
+ gl_region_t *last = vgl->region;
+
+ vgl->region_count = 0;
+ vgl->region = NULL;
+
+ if (subpicture) {
+
+ int count = 0;
+ for (subpicture_region_t *r = subpicture->p_region; r; r = r->p_next)
+ count++;
+
+ vgl->region_count = count;
+ vgl->region = calloc(count, sizeof(*vgl->region));
+
+ if (vgl->use_multitexture)
+ vgl->ActiveTextureARB(GL_TEXTURE0_ARB + 0);
+ int i = 0;
+ for (subpicture_region_t *r = subpicture->p_region; r; r = r->p_next, i++) {
+ gl_region_t *glr = &vgl->region[i];
+
+ glr->format = GL_RGBA;
+ glr->type = GL_UNSIGNED_BYTE;
+ glr->width = r->fmt.i_visible_width;
+ glr->height = r->fmt.i_visible_height;
+ glr->alpha = (float)subpicture->i_alpha * r->i_alpha / 255 / 255;
+ glr->left = 2.0 * (r->i_x ) / subpicture->i_original_picture_width - 1.0;
+ glr->top = -2.0 * (r->i_y ) / subpicture->i_original_picture_height + 1.0;
+ glr->right = 2.0 * (r->i_x + r->fmt.i_visible_width ) / subpicture->i_original_picture_width - 1.0;
+ glr->bottom = -2.0 * (r->i_y + r->fmt.i_visible_height) / subpicture->i_original_picture_height + 1.0;
+
+ glr->texture = 0;
+ for (int j = 0; j < last_count; j++) {
+ if (last[j].texture &&
+ last[j].width == glr->width &&
+ last[j].height == glr->height &&
+ last[j].format == glr->format &&
+ last[j].type == glr->type) {
+ glr->texture = last[j].texture;
+ memset(&last[j], 0, sizeof(last[j]));
+ break;
+ }
+ }
+
+ if (glr->texture) {
+ glBindTexture(GL_TEXTURE_2D, glr->texture);
+ /* TODO set GL_UNPACK_ALIGNMENT */
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / r->p_picture->p->i_pixel_pitch);
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
+ 0, 0, glr->width, glr->height,
+ glr->format, glr->type, r->p_picture->p->p_pixels);
+ } else {
+ glGenTextures(1, &glr->texture);
+ glBindTexture(GL_TEXTURE_2D, glr->texture);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0);
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ /* TODO set GL_UNPACK_ALIGNMENT */
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, r->p_picture->p->i_pitch / r->p_picture->p->i_pixel_pitch);
+ glTexImage2D(GL_TEXTURE_2D, 0, glr->format,
+ glr->width, glr->height, 0, glr->format, glr->type,
+ r->p_picture->p->p_pixels);
+ }
+ }
+ }
+ for (int i = 0; i < last_count; i++) {
+ if (last[i].texture)
+ glDeleteTextures(1, &last[i].texture);
+ }
+ free(last);
vlc_gl_Unlock(vgl->gl);
VLC_UNUSED(subpicture);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
#else
-#if !defined(MACOS_OPENGL)
for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
- if (vgl->chroma->plane_count > 1)
+ if (vgl->use_multitexture)
vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);
glBindTexture(vgl->tex_target, vgl->texture[0][j]);
}
-#endif
glBegin(GL_POLYGON);
glTexCoord2f(left[0], top[0]);
else
glDisable(vgl->tex_target);
+#if !USE_OPENGL_ES
+ if (vgl->use_multitexture)
+ vgl->ActiveTextureARB(GL_TEXTURE0_ARB + 0);
+ glEnable(GL_TEXTURE_2D);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ for (int i = 0; i < vgl->region_count; i++) {
+ gl_region_t *glr = &vgl->region[i];
+
+ glBindTexture(GL_TEXTURE_2D, glr->texture);
+
+ glBegin(GL_POLYGON);
+
+ glColor4f(1.0, 1.0, 1.0, glr->alpha);
+
+ glTexCoord2f(0.0, 0.0);
+ glVertex2f(glr->left, glr->top);
+
+ glTexCoord2f(1.0, 0.0);
+ glVertex2f(glr->right, glr->top);
+
+ glTexCoord2f(1.0, 1.0);
+ glVertex2f(glr->right, glr->bottom);
+
+ glTexCoord2f(0.0, 1.0);
+ glVertex2f(glr->left, glr->bottom);
+
+ glEnd();
+ }
+ glDisable(GL_BLEND);
+ glDisable(GL_TEXTURE_2D);
+#endif
+
vlc_gl_Swap(vgl->gl);
vlc_gl_Unlock(vgl->gl);
projects / vlc / blobdiff