RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: avoid texture arrays for compatibility with Intel low quality crap 

Commit a0b43a1 changed textures to an array, because additional
per-texture information was needed and managing this as array is more
elegant. This broke playback on Windows with Intel drivers (window
shows green video, even though subtitles/OSD work correctly). So change
it back to make it work again.

Affected driver: Intel(R) HD Graphics 3000 9.17.10.2932
This commit is contained in:
wm4 2013-03-05 23:10:02 +01:00
parent 3a0d647e0f
commit 3dcc83a706
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/vo_opengl.c
View File

@ -450,7 +450,7 @@ static void update_uniforms(struct gl_priv *p, GLuint program)
for (int n = 0; n < p->plane_count; n++) { for (int n = 0; n < p->plane_count; n++) {
char textures_n[32]; char textures_n[32];
char textures_size_n[32]; char textures_size_n[32];
snprintf(textures_n, sizeof(textures_n), "textures[%d]", n); snprintf(textures_n, sizeof(textures_n), "texture%d", n);
snprintf(textures_size_n, sizeof(textures_size_n), "textures_size[%d]", n); snprintf(textures_size_n, sizeof(textures_size_n), "textures_size[%d]", n);
gl->Uniform1i(gl->GetUniformLocation(program, textures_n), n); gl->Uniform1i(gl->GetUniformLocation(program, textures_n), n);

20
video/out/vo_opengl_shaders.glsl
View File

@ -87,28 +87,30 @@ void main() {
} }
#!section frag_osd_libass #!section frag_osd_libass
uniform sampler2D textures[3]; uniform sampler2D texture0;
in vec2 texcoord; in vec2 texcoord;
in vec4 color; in vec4 color;
DECLARE_FRAGPARMS DECLARE_FRAGPARMS
void main() { void main() {
out_color = vec4(color.rgb, color.a * texture(textures[0], texcoord).r); out_color = vec4(color.rgb, color.a * texture(texture0, texcoord).r);
} }
#!section frag_osd_rgba #!section frag_osd_rgba
uniform sampler2D textures[3]; uniform sampler2D texture0;
in vec2 texcoord; in vec2 texcoord;
DECLARE_FRAGPARMS DECLARE_FRAGPARMS
void main() { void main() {
out_color = texture(textures[0], texcoord); out_color = texture(texture0, texcoord);
} }
#!section frag_video #!section frag_video
uniform sampler2D textures[3]; uniform sampler2D texture0;
uniform sampler2D texture1;
uniform sampler2D texture2;
uniform vec2 textures_size[3]; uniform vec2 textures_size[3];
uniform sampler1D lut_c_1d; uniform sampler1D lut_c_1d;
uniform sampler1D lut_l_1d; uniform sampler1D lut_l_1d;
@ -313,11 +315,11 @@ vec4 sample_sharpen5(sampler2D tex, vec2 texsize, vec2 texcoord) {
void main() { void main() {
#ifdef USE_PLANAR #ifdef USE_PLANAR
vec3 color = vec3(SAMPLE_L(textures[0], textures_size[0], texcoord).r, vec3 color = vec3(SAMPLE_L(texture0, textures_size[0], texcoord).r,
SAMPLE_C(textures[1], textures_size[1], texcoord).r, SAMPLE_C(texture1, textures_size[1], texcoord).r,
SAMPLE_C(textures[2], textures_size[2], texcoord).r); SAMPLE_C(texture2, textures_size[2], texcoord).r);
#else #else
vec3 color = SAMPLE_L(textures[0], textures_size[0], texcoord).rgb; vec3 color = SAMPLE_L(texture0, textures_size[0], texcoord).rgb;
#endif #endif
#ifdef USE_GBRP #ifdef USE_GBRP
color.gbr = color; color.gbr = color;