[vlc-devel] [PATCH 2/3] opengl: don't test for luminance16 in opengl ES 2, workaround for now
Ilkka Ollakka
ileoo at videolan.org
Fri May 4 12:43:24 CEST 2012
---
modules/video_output/opengl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 59d59b4..3460f9f 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -158,6 +158,7 @@ static inline int GetAlignedSize(unsigned size)
return ((align >> 1) == size) ? size : align;
}
+#ifndef USE_OPENGL_ES
static bool IsLuminance16Supported(int target)
{
GLuint texture;
@@ -173,6 +174,7 @@ static bool IsLuminance16Supported(int target)
return size == 16;
}
+#endif
vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
const vlc_fourcc_t **subpicture_chromas,
@@ -243,6 +245,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl->tex_type = GL_UNSIGNED_BYTE;
yuv_range_correction = 1.0;
break;
+#ifndef USE_OPENGL_ES
} else if (dsc && dsc->plane_count == 3 && dsc->pixel_size == 2 &&
IsLuminance16Supported(vgl->tex_target)) {
need_fs_yuv = true;
@@ -253,6 +256,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl->tex_type = GL_UNSIGNED_SHORT;
yuv_range_correction = (float)((1 << 16) - 1) / ((1 << dsc->pixel_bits) - 1);
break;
+#endif
}
list++;
}
--
1.7.9.2
More information about the vlc-devel
mailing list