Commit 17869161 authored by Felix Paul Kühne's avatar Felix Paul Kühne

opengl: iterate on previous commit

parent 1cc498b2
...@@ -284,6 +284,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl, ...@@ -284,6 +284,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl,
free(code); free(code);
} }
#if 0
static void BuildRGBFragmentShader(vout_display_opengl_t *vgl, static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
GLint *shader) GLint *shader)
{ {
...@@ -301,6 +302,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl, ...@@ -301,6 +302,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
vgl->ShaderSource(*shader, 1, &code, NULL); vgl->ShaderSource(*shader, 1, &code, NULL);
vgl->CompileShader(*shader); vgl->CompileShader(*shader);
} }
#endif
static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl, static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
GLint *shader) GLint *shader)
...@@ -465,11 +467,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -465,11 +467,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl->shader[1] = vgl->shader[1] =
vgl->shader[2] = -1; vgl->shader[2] = -1;
vgl->local_count = 0; vgl->local_count = 0;
if (supports_shaders && vlc_fourcc_IsYUV(fmt->i_chroma)) { if (supports_shaders && need_fs_yuv) {
BuildYUVFragmentShader(vgl, &vgl->shader[0], BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count,
&vgl->local_count, vgl->local_value, fmt, yuv_range_correction);
vgl->local_value,
fmt, yuv_range_correction);
BuildRGBAFragmentShader(vgl, &vgl->shader[1]); BuildRGBAFragmentShader(vgl, &vgl->shader[1]);
BuildVertexShader(vgl, &vgl->shader[2]); BuildVertexShader(vgl, &vgl->shader[2]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment