June 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36342 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:20 2013 New Revision: 36342 Log: Remove a special-case that doesn't really make much of a visual difference. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:19 2013 (r36341) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:20 2013 (r36342) @@ -145,8 +145,8 @@ static void draw_text(const uint8_t *pic bump_pic[p] = Z_Depth; } - if (text[p] && c > 10) - draw_char(text[p] + 1, c, x, y, text_depth[p] + bump_pic[p]); + if (c > 10) + draw_char(text[p], c, x, y, text_depth[p] + bump_pic[p]); if (text_depth[p] < 0.1) text_depth[p] = 0; @@ -154,7 +154,7 @@ static void draw_text(const uint8_t *pic text_depth[p] /= 1.1; if (text_light[p] > 128 && text_light[p + text_x] < 10) - draw_illuminatedchar(text[p] + 1, x, y, + draw_illuminatedchar(text[p], x, y, text_depth[p] + bump_pic[p]); p++;

1 0

r36341 - in trunk/libvo: matrixview.c matrixview_font.h
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:19 2013 New Revision: 36341 Log: Use only one single texture. Modified: trunk/libvo/matrixview.c trunk/libvo/matrixview_font.h Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:18 2013 (r36340) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:19 2013 (r36341) @@ -34,13 +34,6 @@ static float matrix_contrast = 1.5; static float matrix_brightness = 1.0; -static const uint8_t flare[4][4] = { - { 0, 0, 0, 0}, - { 0, 180, 0, 0}, - { 0, 0, 0, 0}, - { 0, 0, 0, 0} -}; - #define MAX_TEXT_X 0x4000 #define MAX_TEXT_Y 0x4000 static int text_x = 0; @@ -109,13 +102,13 @@ static void draw_flare(float x, float y, { mpglColor4ub(204, 204, 204, 255); // Basic polygon color - mpglTexCoord2f(0, 0); + mpglTexCoord2f(1.0 - 4.0/128, 1.0 - 4.0/64); mpglVertex3f(x - 1, y + 1, z); - mpglTexCoord2f(0.75, 0); + mpglTexCoord2f(1.0 - 1.0/128, 1.0 - 4.0/64); mpglVertex3f(x + 2, y + 1, z); - mpglTexCoord2f(0.75, 0.75); + mpglTexCoord2f(1.0 - 1.0/128, 1.0 - 1.0/64); mpglVertex3f(x + 2, y - 2, z); - mpglTexCoord2f(0, 0.75); + mpglTexCoord2f(1.0 - 4.0/128, 1.0 - 1.0/64); mpglVertex3f(x - 1, y - 2, z); } @@ -248,17 +241,6 @@ static void ourBuildTextures(void) font_texture); mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - mpglBindTexture(GL_TEXTURE_2D, 1); - mpglTexImage2D(GL_TEXTURE_2D, 0, 1, 4, 4, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, - flare); - mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - // Some pretty standard settings for wrapping and filtering. - mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - mpglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - mpglBindTexture(GL_TEXTURE_2D, 0); } void matrixview_init(int w, int h) @@ -308,13 +290,8 @@ void matrixview_draw(double currentTime, // OK, let's start drawing our planer quads. mpglBegin(GL_QUADS); draw_text(data); - mpglEnd(); - - mpglBindTexture(GL_TEXTURE_2D, 1); - mpglBegin(GL_QUADS); draw_flares(); mpglEnd(); - mpglBindTexture(GL_TEXTURE_2D, 0); make_change(currentTime); } Modified: trunk/libvo/matrixview_font.h ============================================================================== --- trunk/libvo/matrixview_font.h Wed Jun 12 20:54:18 2013 (r36340) +++ trunk/libvo/matrixview_font.h Wed Jun 12 20:54:19 2013 (r36341) @@ -563,7 +563,7 @@ static const uint8_t font_texture[FONT_T 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0 }, { 6, 25, 191, 220, 242, 255, 243, 222, 220, 221, 139, 5, 5, 5, 64, 246, 244, 63, 7, 7, 6, 7, 6, 6, 8, 6, 6, 7, 6, 26, 211, 255, @@ -572,7 +572,7 @@ static const uint8_t font_texture[FONT_T 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0 }, { 5, 9, 23, 27, 165, 255, 140, 26, 26, 26, 18, 5, 5, 5, 8, 111, 245, 219, 57, 6, 6, 6, 5, 7, 7, 6, 6, 6, 6, 6, 52, 211, @@ -581,7 +581,7 @@ static const uint8_t font_texture[FONT_T 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 180, 0, 0 }, { 6, 6, 6, 6, 186, 255, 95, 5, 5, 5, 5, 5, 5, 5, 5, 8, 73, 197, 236, 155, 88, 82, 44, 7, 6, 6, 7, 7, 6, 7, 6, 31, @@ -590,7 +590,7 @@ static const uint8_t font_texture[FONT_T 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0 }, { 5, 6, 5, 8, 84, 107, 28, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 17, 52, 99, 103, 90, 35, 6, 5, 5, 6, 5, 6, 6, 6, 5, @@ -599,7 +599,7 @@ static const uint8_t font_texture[FONT_T 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0 } };

1 0

r36340 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:18 2013 New Revision: 36340 Log: Fix texture coordinates and number of characters. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:16 2013 (r36339) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:18 2013 (r36340) @@ -64,12 +64,12 @@ static void draw_char(int num, float lig float tx, ty; int num2, num3; - num &= 63; + num %= 55; //light = light / 255; //light=7-light;num+=(light*60); light *= matrix_brightness; num2 = num / 10; num3 = num - (num2 * 10); - ty = (float)num2 / 7; + ty = (float)num2 / 6; tx = (float)num3 / 10; mpglColor4ub(0, light, 0, 255); // Basic polygon color @@ -88,9 +88,10 @@ static void draw_illuminatedchar(int num float tx, ty; int num2, num3; + num %= 55; num2 = num / 10; num3 = num - (num2 * 10); - ty = (float)num2 / 7; + ty = (float)num2 / 6; tx = (float)num3 / 10; mpglColor4ub(128, 128, 128, 255); // Basic polygon color

1 0

r36339 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:16 2013 New Revision: 36339 Log: Simplify blend function used. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:15 2013 (r36338) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:16 2013 (r36339) @@ -71,7 +71,7 @@ static void draw_char(int num, float lig num3 = num - (num2 * 10); ty = (float)num2 / 7; tx = (float)num3 / 10; - mpglColor4ub(0, 255, 0, light); // Basic polygon color + mpglColor4ub(0, light, 0, 255); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z); @@ -92,7 +92,7 @@ static void draw_illuminatedchar(int num num3 = num - (num2 * 10); ty = (float)num2 / 7; tx = (float)num3 / 10; - mpglColor4ub(255, 255, 255, 128); // Basic polygon color + mpglColor4ub(128, 128, 128, 255); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z); @@ -106,7 +106,7 @@ static void draw_illuminatedchar(int num static void draw_flare(float x, float y, float z) //flare { - mpglColor4ub(255, 255, 255, 204); // Basic polygon color + mpglColor4ub(204, 204, 204, 255); // Basic polygon color mpglTexCoord2f(0, 0); mpglVertex3f(x - 1, y + 1, z); @@ -275,7 +275,7 @@ void matrixview_init(int w, int h) mpglEnable(GL_BLEND); mpglEnable(GL_TEXTURE_2D); - mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); + mpglBlendFunc(GL_ONE, GL_ONE); matrixview_reshape(w, h); }

1 0

r36338 - in trunk/libvo: matrixview.c vo_matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:15 2013 New Revision: 36338 Log: Remove unused depth test code. Modified: trunk/libvo/matrixview.c trunk/libvo/vo_matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:14 2013 (r36337) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:15 2013 (r36338) @@ -269,10 +269,6 @@ void matrixview_init(int w, int h) // Color to clear color buffer to. mpglClearColor(0.0f, 0.0f, 0.0f, 0.0f); - // Depth to clear depth buffer to; type of test. - mpglClearDepth(1.0); - mpglDepthFunc(GL_LESS); - // Allow adjusting of texture color via glColor mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); @@ -280,7 +276,6 @@ void matrixview_init(int w, int h) mpglEnable(GL_TEXTURE_2D); mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); - mpglDisable(GL_DEPTH_TEST); matrixview_reshape(w, h); } @@ -307,7 +302,7 @@ void matrixview_reshape(int w, int h) void matrixview_draw(double currentTime, const uint8_t *data) { // Clear the color and depth buffers. - mpglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + mpglClear(GL_COLOR_BUFFER_BIT); // OK, let's start drawing our planer quads. mpglBegin(GL_QUADS); Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Wed Jun 12 20:54:14 2013 (r36337) +++ trunk/libvo/vo_matrixview.c Wed Jun 12 20:54:15 2013 (r36338) @@ -105,7 +105,6 @@ static int config(uint32_t width, uint32 image_width = width; image_format = format; - flags |= VOFLAG_DEPTH; if (mpglcontext_create_window(&glctx, d_width, d_height, flags, title) < 0) return -1; if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED)

1 0

r36337 - trunk/libvo/matrixview.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:14 2013 New Revision: 36337 Log: Remove code related to unused lighting. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Wed Jun 12 20:54:12 2013 (r36336) +++ trunk/libvo/matrixview.c Wed Jun 12 20:54:14 2013 (r36337) @@ -34,11 +34,6 @@ static float matrix_contrast = 1.5; static float matrix_brightness = 1.0; -// Settings for our light. Try playing with these (or add more lights). -static float Light_Ambient[] = { 0.1f, 0.1f, 0.1f, 1.0f }; -static float Light_Diffuse[] = { 1.2f, 1.2f, 1.2f, 1.0f }; -static float Light_Position[] = { 2.0f, 2.0f, 0.0f, 1.0f }; - static const uint8_t flare[4][4] = { { 0, 0, 0, 0}, { 0, 180, 0, 0}, @@ -76,7 +71,6 @@ static void draw_char(int num, float lig num3 = num - (num2 * 10); ty = (float)num2 / 7; tx = (float)num3 / 10; - mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting mpglColor4ub(0, 255, 0, light); // Basic polygon color mpglTexCoord2f(tx, ty); @@ -98,7 +92,6 @@ static void draw_illuminatedchar(int num num3 = num - (num2 * 10); ty = (float)num2 / 7; tx = (float)num3 / 10; - mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting mpglColor4ub(255, 255, 255, 128); // Basic polygon color mpglTexCoord2f(tx, ty); @@ -113,7 +106,6 @@ static void draw_illuminatedchar(int num static void draw_flare(float x, float y, float z) //flare { - mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting mpglColor4ub(255, 255, 255, 204); // Basic polygon color mpglTexCoord2f(0, 0); @@ -281,26 +273,12 @@ void matrixview_init(int w, int h) mpglClearDepth(1.0); mpglDepthFunc(GL_LESS); - // Enables Smooth Color Shading; try GL_FLAT for (lack of) fun. - mpglShadeModel(GL_SMOOTH); - - // Set up a light, turn it on. - mpglLightfv(GL_LIGHT1, GL_POSITION, Light_Position); - mpglLightfv(GL_LIGHT1, GL_AMBIENT, Light_Ambient); - mpglLightfv(GL_LIGHT1, GL_DIFFUSE, Light_Diffuse); - mpglEnable(GL_LIGHT1); - - // A handy trick -- have surface material mirror the color. - mpglColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE); - mpglEnable(GL_COLOR_MATERIAL); - // Allow adjusting of texture color via glColor mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); mpglEnable(GL_BLEND); mpglEnable(GL_TEXTURE_2D); - mpglDisable(GL_LIGHTING); mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); mpglDisable(GL_DEPTH_TEST);

1 0

r36336 - trunk/libvo/gl_common.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Wed Jun 12 20:54:12 2013 New Revision: 36336 Log: gl: Ensure gpu_def_sl_program is correctly initialized. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Wed Jun 12 16:26:15 2013 (r36335) +++ trunk/libvo/gl_common.c Wed Jun 12 20:54:12 2013 (r36336) @@ -2171,6 +2171,7 @@ static int setGlWindow_w32(MPGLContext * *vinfo = new_vinfo; getFunctions(w32gpa, NULL); + gpu_def_sl_program = 0; gpu_yuv_sl_program = 0; // and inform that reinit is neccessary @@ -2320,6 +2321,7 @@ static int setGlWindow_x11(MPGLContext * } free(glxstr); + gpu_def_sl_program = 0; gpu_yuv_sl_program = 0; // and inform that reinit is neccessary @@ -2374,6 +2376,7 @@ static int setGlWindow_sdl(MPGLContext * return SET_WINDOW_FAILED; SDL_GL_LoadLibrary(NULL); getFunctions(sdlgpa, NULL); + gpu_def_sl_program = 0; gpu_yuv_sl_program = 0; return SET_WINDOW_OK; } @@ -2601,6 +2604,7 @@ static void swapGlBuffers_egl(MPGLContex static int setGlWindow_dummy(MPGLContext *ctx) { getFunctions(NULL, NULL); + gpu_def_sl_program = 0; gpu_yuv_sl_program = 0; return SET_WINDOW_OK; }

1 0

r36334 - trunk/libvo/gl_common.c
by reimar 12 Jun '13

12 Jun '13

Author: reimar Date: Tue Jun 11 22:48:43 2013 New Revision: 36334 Log: vo_gl: Make yuv=8 compatible with OpenGL in addition to OpenGL ES. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Tue Jun 11 21:23:12 2013 (r36333) +++ trunk/libvo/gl_common.c Tue Jun 11 22:48:43 2013 (r36334) @@ -1619,8 +1619,15 @@ static const char vertex_shader[] = "attribute vec2 tca, tca2, tca3;\n" "varying vec2 tcv, tcv2, tcv3;\n" "void main() {\n" + "#ifdef GL_ES\n" " gl_Position = matrix * vPos;\n" " tcv = tca; tcv2 = tca2; tcv3 = tca3;\n" + "#else\n" + " gl_Position = gl_ModelViewProjectionMatrix * vPos;\n" + " tcv = vec2(gl_MultiTexCoord0);\n" + " tcv2 = vec2(gl_MultiTexCoord1);\n" + " tcv3 = vec2(gl_MultiTexCoord2);\n" + "#endif\n" "}\n"; #if defined(CONFIG_GL_EGL_X11) || defined(CONFIG_GL_EGL_ANDROID) @@ -1634,7 +1641,9 @@ static GLuint new_gpu_program(void) { #endif static const char def_frag_shader[] = + "#ifdef GL_ES\n" "precision mediump float;\n" + "#endif\n" "uniform sampler2D texs[4];\n" "varying vec2 tcv;\n" "void main() {\n" @@ -1642,7 +1651,9 @@ static const char def_frag_shader[] = "}\n"; static const char yuv_frag_shader_template[] = + "#ifdef GL_ES\n" "precision mediump float;\n" + "#endif\n" "uniform sampler2D texs[4];\n" "varying vec2 tcv, tcv2, tcv3;\n" "void main() {\n" @@ -1731,6 +1742,7 @@ static void use_program(GLuint prog) { static const GLint texs[] = {0, 1, 2, 3, 4}; mpglUseProgram(prog); gpu_cur_sl_program = prog; + if (!prog) return; loc = mpglGetUniformLocation(prog, "texs"); mpglUniform1iv(loc, sizeof(texs)/sizeof(texs[0]), texs); matrix_uniform(transform_matrix); @@ -1785,6 +1797,8 @@ void glSetupYUVConversion(gl_conversion_ glSetupYUVFragprog(params); break; case YUV_CONVERSION_SL_PROGRAM: + if (!gpu_yuv_sl_program) + gpu_yuv_sl_program = new_gpu_program(); update_yuv_frag_src(params); break; case YUV_CONVERSION_NONE: @@ -2159,6 +2173,8 @@ static int setGlWindow_w32(MPGLContext * *vinfo = new_vinfo; getFunctions(w32gpa, NULL); + gpu_yuv_sl_program = 0; + // and inform that reinit is neccessary res = SET_WINDOW_REINIT; } else @@ -2306,6 +2322,8 @@ static int setGlWindow_x11(MPGLContext * } free(glxstr); + gpu_yuv_sl_program = 0; + // and inform that reinit is neccessary return SET_WINDOW_REINIT; } @@ -2358,6 +2376,7 @@ static int setGlWindow_sdl(MPGLContext * return SET_WINDOW_FAILED; SDL_GL_LoadLibrary(NULL); getFunctions(sdlgpa, NULL); + gpu_yuv_sl_program = 0; return SET_WINDOW_OK; } @@ -2544,13 +2563,14 @@ static int setGlWindow_egl(MPGLContext * mpglSwapInterval = SwapInterval_egl; gpu_def_sl_program = new_gpu_program(); - gpu_yuv_sl_program = new_gpu_program(); set_frag_src(gpu_def_sl_program, def_frag_shader); mpglLoadMatrixf = matrix_uniform; mpglColor4ub = dummy_color; mpglTexEnvi = dummy_texenvi; use_program(gpu_def_sl_program); + gpu_yuv_sl_program = 0; + // and inform that reinit is necessary return SET_WINDOW_REINIT; } @@ -2583,6 +2603,7 @@ static void swapGlBuffers_egl(MPGLContex static int setGlWindow_dummy(MPGLContext *ctx) { getFunctions(NULL, NULL); + gpu_yuv_sl_program = 0; return SET_WINDOW_OK; }

4 7

r36335 - trunk/libvo/gl_common.c
by ib 12 Jun '13

12 Jun '13

Author: ib Date: Wed Jun 12 16:26:15 2013 New Revision: 36335 Log: Revert r36287. All variants are using the code now. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Tue Jun 11 22:48:43 2013 (r36334) +++ trunk/libvo/gl_common.c Wed Jun 12 16:26:15 2013 (r36335) @@ -1630,7 +1630,6 @@ static const char vertex_shader[] = "#endif\n" "}\n"; -#if defined(CONFIG_GL_EGL_X11) || defined(CONFIG_GL_EGL_ANDROID) static GLuint new_gpu_program(void) { GLuint program = mpglCreateProgram(); GLuint shader = compile_shader(GL_VERTEX_SHADER, vertex_shader); @@ -1638,7 +1637,6 @@ static GLuint new_gpu_program(void) { mpglDeleteShader(shader); return program; } -#endif static const char def_frag_shader[] = "#ifdef GL_ES\n"

1 0

r36333 - trunk/libvo/vo_aa.c
by reimar 11 Jun '13

11 Jun '13

Author: reimar Date: Tue Jun 11 21:23:12 2013 New Revision: 36333 Log: vo_aa: Specifying a single option should only change the value of that option. Previous code mean that specifying anything at all would disable all aalib options. Modified: trunk/libvo/vo_aa.c Modified: trunk/libvo/vo_aa.c ============================================================================== --- trunk/libvo/vo_aa.c Tue Jun 11 20:38:56 2013 (r36332) +++ trunk/libvo/vo_aa.c Tue Jun 11 21:23:12 2013 (r36333) @@ -613,6 +613,7 @@ static int parse_suboptions(const char * p->name = booleans_list[i] + 1; p->type = OPT_ARG_BOOL; p->valp = &booleans[i]; + booleans[i] = -1; } memcpy(p, extra_opts, sizeof(extra_opts)); @@ -640,6 +641,7 @@ static int parse_suboptions(const char * } pseudoargv[2] = NULL; for (i=0; i<nbooleans; i++) { + if (booleans[i] == -1) continue; pseudoargc = 2; if (booleans[i]) pseudoargv[1] = booleans_list[i]; else pseudoargv[1] = nobooleans_list[i];

1 0