GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-28 23:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo_opengl: cleanup dither texture creation

Browse Source 
Might be slightly more compatible too, and will make it work on GLES.
This commit is contained in:
wm4
2014-12-17 21:36:17 +01:00
parent 4681e7f49f
commit 84ec21ea23
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/gl_video.c
+9 -4
View File
@@ -1262,9 +1262,9 @@ static void init_dither(struct gl_video *p)
int tex_size;
void *tex_data;
GLint tex_iformat;
GLint tex_format;
GLenum tex_type;
unsigned char temp[256];
GLint tex_format = find_tex_format(gl, 1, 1)->format;
if (p->opts.dither_algo == 0) {
int sizeb = p->opts.dither_size;
@@ -1278,16 +1278,19 @@ static void init_dither(struct gl_video *p)
}
tex_size = size;
tex_iformat = find_tex_format(gl, 2, 1)->internal_format;
tex_iformat = gl_float16_formats[0].internal_format;
tex_format = gl_float16_formats[0].format;
tex_type = GL_FLOAT;
tex_data = p->last_dither_matrix;
} else {
assert(sizeof(temp) >= 8 * 8);
mp_make_ordered_dither_matrix(temp, 8);
const struct fmt_entry *fmt = find_tex_format(gl, 1, 1);
tex_size = 8;
tex_iformat = tex_format;
tex_type = GL_UNSIGNED_BYTE;
tex_iformat = fmt->internal_format;
tex_format = fmt->format;
tex_type = fmt->type;
tex_data = temp;
}
@@ -1311,6 +1314,8 @@ static void init_dither(struct gl_video *p)
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
gl->ActiveTexture(GL_TEXTURE0);
debug_check_gl(p, "dither setup");
}
static void recreate_osd(struct gl_video *p)