From 757c8baf8c5bd4598cd5455908e4fa543821837a Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 27 Apr 2016 19:02:04 +0200 Subject: vo_opengl: always use sized internal formats This shouldn't make much of a difference, but should make the following commit simpler. --- video/out/opengl/video.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index de5c49da34..b517e9fb2a 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -261,10 +261,10 @@ static const struct fmt_entry mp_to_gl_formats[] = { }; static const struct fmt_entry gl_byte_formats[] = { - {0, GL_RED, GL_RED, GL_UNSIGNED_BYTE}, // 1 x 8 - {0, GL_RG, GL_RG, GL_UNSIGNED_BYTE}, // 2 x 8 - {0, GL_RGB, GL_RGB, GL_UNSIGNED_BYTE}, // 3 x 8 - {0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE}, // 4 x 8 + {0, GL_R8, GL_RED, GL_UNSIGNED_BYTE}, // 1 x 8 + {0, GL_RG8, GL_RG, GL_UNSIGNED_BYTE}, // 2 x 8 + {0, GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE}, // 3 x 8 + {0, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE}, // 4 x 8 {0, GL_R16, GL_RED, GL_UNSIGNED_SHORT}, // 1 x 16 {0, GL_RG16, GL_RG, GL_UNSIGNED_SHORT}, // 2 x 16 {0, GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT}, // 3 x 16 @@ -307,10 +307,10 @@ static const struct fmt_entry gl_byte_formats_gles2[] = { }; static const struct fmt_entry gl_byte_formats_legacy[] = { - {0, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE}, // 1 x 8 - {0, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE}, // 2 x 8 - {0, GL_RGB, GL_RGB, GL_UNSIGNED_BYTE}, // 3 x 8 - {0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE}, // 4 x 8 + {0, GL_LUMINANCE8, GL_LUMINANCE, GL_UNSIGNED_BYTE}, // 1 x 8 + {0, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE}, // 2 x 8 + {0, GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE}, // 3 x 8 + {0, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE}, // 4 x 8 {0, GL_LUMINANCE16, GL_LUMINANCE, GL_UNSIGNED_SHORT},// 1 x 16 {0, GL_LUMINANCE16_ALPHA16, GL_LUMINANCE_ALPHA, GL_UNSIGNED_SHORT},// 2 x 16 {0, GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT},// 3 x 16 -- cgit v1.2.3