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

r36232 - trunk/libvo/matrixview.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 23:44:42 2013 New Revision: 36232 Log: Fix matrixview color. Was broken when replacing glColor4f with glColor4ub. Modified: trunk/libvo/matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Sat May 4 23:41:37 2013 (r36231) +++ trunk/libvo/matrixview.c Sat May 4 23:44:42 2013 (r36232) @@ -77,7 +77,7 @@ static void draw_char(int num, float lig ty = (float)num2 / 7; tx = (float)num3 / 10; mpglNormal3f(0.0f, 0.0f, 1.0f); // Needed for lighting - mpglColor4ub(0, 255, 255, light); // Basic polygon color + mpglColor4ub(0, 255, 0, light); // Basic polygon color mpglTexCoord2f(tx, ty); mpglVertex3f(x, y, z);

1 0

r36231 - trunk/input/input.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 23:41:37 2013 New Revision: 36231 Log: Simplify and clean up code. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Sat May 4 23:41:36 2013 (r36230) +++ trunk/input/input.c Sat May 4 23:41:37 2013 (r36231) @@ -1581,10 +1581,14 @@ mp_input_free_binds(mp_cmd_bind_t* binds } +static void strmove(char *dst, const char *src) { + memmove(dst, src, strlen(src) + 1); +} + static int mp_input_parse_config(char *file) { int fd; - int bs = 0,r,eof = 0,comments = 0; + int eof = 0,comments = 0; char *iter,*end; char buffer[BS_MAX]; int n_binds = 0, keys[MP_MAX_KEY_DOWN+1] = { 0 }; @@ -1599,25 +1603,24 @@ mp_input_parse_config(char *file) { mp_msg(MSGT_INPUT,MSGL_V,"Parsing input config file %s\n",file); + buffer[0] = 0; while(1) { + int bs = strlen(buffer); if(! eof && bs < BS_MAX-1) { - if(bs > 0) bs--; - r = read(fd,buffer+bs,BS_MAX-1-bs); + int r = read(fd,buffer+bs,BS_MAX-1-bs); if(r < 0) { if(errno == EINTR) continue; mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno)); close(fd); return 0; - } else if(r == 0) { - eof = 1; - } else { - bs += r+1; - buffer[bs-1] = 0; } + eof = r == 0; + bs += r; + buffer[bs] = 0; } // Empty buffer : return - if(bs <= 1) { + if(!buffer[0]) { mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds); close(fd); return 1; @@ -1626,17 +1629,15 @@ mp_input_parse_config(char *file) { iter = buffer; if(comments) { + // search for newline ending comment for( ; iter[0] && iter[0] != '\n' ; iter++) /* NOTHING */; if(!iter[0]) { // Buffer was full of comment - bs = 0; + buffer[0] = 0; continue; } - iter++; - r = strlen(iter); - memmove(buffer,iter,r+1); - bs = r+1; comments = 0; + strmove(buffer, iter+1); continue; } @@ -1646,7 +1647,7 @@ mp_input_parse_config(char *file) { for( ; iter[0] && strchr(SPACE_CHAR,iter[0]) != NULL ; iter++) /* NOTHING */; if(!iter[0]) { // Buffer was full of space char - bs = 0; + buffer[0] = 0; continue; } if(iter[0] == '#') { // Comments @@ -1658,29 +1659,19 @@ mp_input_parse_config(char *file) { /*NOTHING */; if(!end[0]) { // Key name doesn't fit in the buffer if(buffer == iter) { - if(eof && (buffer-iter) == bs) - mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnfinishedBinding,iter); - else - mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter); return 0; } - memmove(buffer,iter,end-iter); - bs = end-iter; + strmove(buffer,iter); continue; } - { - char name[end-iter+1]; - strncpy(name,iter,end-iter); - name[end-iter] = 0; - if(! mp_input_get_input_from_name(name,keys)) { - mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,name); + end[0] = 0; + if(! mp_input_get_input_from_name(iter,keys)) { + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,iter); close(fd); return 0; } - } - if( bs > (end-buffer)) - memmove(buffer,end,bs - (end-buffer)); - bs -= end-buffer; + strmove(buffer,end+1); continue; } else { // Get the command while(iter[0] == ' ' || iter[0] == '\t') iter++; @@ -1692,37 +1683,25 @@ mp_input_parse_config(char *file) { mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(keys[i])); mp_msg(MSGT_INPUT,MSGL_ERR,"\n"); keys[0] = 0; - if(iter > buffer) { - memmove(buffer,iter,bs- (iter-buffer)); - bs -= (iter-buffer); - } + strmove(buffer,iter+1); continue; } for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] ; end++) /* NOTHING */; - if(!end[0] && ! (eof && ((end+1) - buffer) == bs)) { + if(!end[0]) { if(iter == buffer) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer); close(fd); return 0; } - memmove(buffer,iter,end - iter); - bs = end - iter; + strmove(buffer,iter); continue; } - { - char cmd[end-iter+1]; - strncpy(cmd,iter,end-iter); - cmd[end-iter] = 0; - //printf("Set bind %d => %s\n",keys[0],cmd); - mp_input_bind_keys(keys,cmd); + end[0] = 0; + mp_input_bind_keys(keys,iter); n_binds++; - } keys[0] = 0; - end++; - if(bs > (end-buffer)) - memmove(buffer,end,bs-(end-buffer)); - bs -= (end-buffer); + strmove(buffer,end+1); continue; } }

1 0

r36230 - trunk/input/input.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 23:41:36 2013 New Revision: 36230 Log: Cosmetics, simplify end-of-string checks. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Sat May 4 23:41:35 2013 (r36229) +++ trunk/input/input.c Sat May 4 23:41:36 2013 (r36230) @@ -1613,7 +1613,7 @@ mp_input_parse_config(char *file) { eof = 1; } else { bs += r+1; - buffer[bs-1] = '\0'; + buffer[bs-1] = 0; } } // Empty buffer : return @@ -1626,9 +1626,9 @@ mp_input_parse_config(char *file) { iter = buffer; if(comments) { - for( ; iter[0] != '\0' && iter[0] != '\n' ; iter++) + for( ; iter[0] && iter[0] != '\n' ; iter++) /* NOTHING */; - if(iter[0] == '\0') { // Buffer was full of comment + if(!iter[0]) { // Buffer was full of comment bs = 0; continue; } @@ -1643,9 +1643,9 @@ mp_input_parse_config(char *file) { // Find the wanted key if(keys[0] == 0) { // Jump beginning space - for( ; iter[0] != '\0' && strchr(SPACE_CHAR,iter[0]) != NULL ; iter++) + for( ; iter[0] && strchr(SPACE_CHAR,iter[0]) != NULL ; iter++) /* NOTHING */; - if(iter[0] == '\0') { // Buffer was full of space char + if(!iter[0]) { // Buffer was full of space char bs = 0; continue; } @@ -1654,9 +1654,9 @@ mp_input_parse_config(char *file) { continue; } // Find the end of the key code name - for(end = iter; end[0] != '\0' && strchr(SPACE_CHAR,end[0]) == NULL ; end++) + for(end = iter; end[0] && strchr(SPACE_CHAR,end[0]) == NULL ; end++) /*NOTHING */; - if(end[0] == '\0') { // Key name doesn't fit in the buffer + if(!end[0]) { // Key name doesn't fit in the buffer if(buffer == iter) { if(eof && (buffer-iter) == bs) mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnfinishedBinding,iter); @@ -1671,7 +1671,7 @@ mp_input_parse_config(char *file) { { char name[end-iter+1]; strncpy(name,iter,end-iter); - name[end-iter] = '\0'; + name[end-iter] = 0; if(! mp_input_get_input_from_name(name,keys)) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,name); close(fd); @@ -1698,9 +1698,9 @@ mp_input_parse_config(char *file) { } continue; } - for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] != '\0' ; end++) + for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] ; end++) /* NOTHING */; - if(end[0] == '\0' && ! (eof && ((end+1) - buffer) == bs)) { + if(!end[0] && ! (eof && ((end+1) - buffer) == bs)) { if(iter == buffer) { mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer); close(fd); @@ -1713,7 +1713,7 @@ mp_input_parse_config(char *file) { { char cmd[end-iter+1]; strncpy(cmd,iter,end-iter); - cmd[end-iter] = '\0'; + cmd[end-iter] = 0; //printf("Set bind %d => %s\n",keys[0],cmd); mp_input_bind_keys(keys,cmd); n_binds++;

1 0

r36229 - trunk/input/input.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 23:41:35 2013 New Revision: 36229 Log: Remove unnecessary and incorrect assignment. Thanks to Martynas Venckus [martynas venck us] for spotting and reporting the bug. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Sat May 4 22:01:40 2013 (r36228) +++ trunk/input/input.c Sat May 4 23:41:35 2013 (r36229) @@ -1723,7 +1723,6 @@ mp_input_parse_config(char *file) { if(bs > (end-buffer)) memmove(buffer,end,bs-(end-buffer)); bs -= (end-buffer); - buffer[bs-1] = '\0'; continue; } }

1 0

r36228 - in trunk/libvo: gl_common.c gl_compat.h
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 22:01:40 2013 New Revision: 36228 Log: gl: support advanced processing for GLES2. Brightness, contrast, saturation, gamma and xyz transform. No advanced scaling yet though. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_compat.h Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 22:01:38 2013 (r36227) +++ trunk/libvo/gl_common.c Sat May 4 22:01:40 2013 (r36228) @@ -152,6 +152,7 @@ void (GLAPIENTRY *mpglShaderSource)(GLui void (GLAPIENTRY *mpglCompileShader)(GLuint); void (GLAPIENTRY *mpglGetShaderiv)(GLuint, GLenum, GLint *); void (GLAPIENTRY *mpglGetShaderInfoLog)(GLuint, GLsizei, GLsizei *, char *); +void (GLAPIENTRY *mpglGetAttachedShaders)(GLuint, GLsizei, GLsizei *, GLuint *); void (GLAPIENTRY *mpglAttachShader)(GLuint, GLuint); void (GLAPIENTRY *mpglDetachShader)(GLuint, GLuint); void (GLAPIENTRY *mpglDeleteShader)(GLuint); @@ -529,6 +530,7 @@ static const extfunc_desc_t extfuncs[] = SIMPLE_FUNC_DESC(CompileShader), SIMPLE_FUNC_DESC(GetShaderiv), SIMPLE_FUNC_DESC(GetShaderInfoLog), + SIMPLE_FUNC_DESC(GetAttachedShaders), SIMPLE_FUNC_DESC(AttachShader), SIMPLE_FUNC_DESC(DetachShader), SIMPLE_FUNC_DESC(DeleteShader), @@ -1634,25 +1636,50 @@ static const char def_frag_shader[] = " gl_FragColor = texture2D(texs[0], tcv);\n" "}\n"; -static const char yuv_frag_shader[] = +static const char yuv_frag_shader_template[] = "precision mediump float;\n" "uniform sampler2D texs[4];\n" - "varying vec2 tcv, tcv2;\n" + "varying vec2 tcv, tcv2, tcv3;\n" "void main() {\n" + " const vec3 gamma = vec3(%e, %e, %e);\n" + " const float xyz_gamma = %e;\n" " const mat4 yuv_conv = mat4(\n" - " 1.164000e+00, 1.164000e+00, 1.164000e+00, 0,\n" - " 0.000000e+00, -3.910000e-01, 2.018000e+00, 0,\n" - " 1.596000e+00, -8.130000e-01, 0.000000e+00, 0,\n" - " -8.741648e-01, 5.313256e-01, -1.085992e+00, 1\n" + " %e, %e, %e, 0,\n" + " %e, %e, %e, 0,\n" + " %e, %e, %e, 0,\n" + " %e, %e, %e, 1\n" " );\n" " vec4 yuv = vec4(0.0, 0.5, 0.5, 1.0);\n" - " yuv.r = texture2D(texs[0], tcv).r;\n" - " yuv.g = texture2D(texs[1], tcv2).r;\n" - " yuv.b = texture2D(texs[2], tcv2).r;\n" - " gl_FragColor = yuv_conv * yuv;\n" + " if (%i == 0) {\n" + " yuv = texture2D(texs[0], tcv);\n" + " } else {\n" + " yuv.r = texture2D(texs[0], tcv).r;\n" + " yuv.g = texture2D(texs[1], tcv2).r;\n" + " yuv.b = texture2D(texs[2], tcv2).r;\n" + " }\n" + " if (xyz_gamma != 1.0)\n" + " yuv.rgb = pow(yuv.rgb, vec3(xyz_gamma, xyz_gamma, xyz_gamma));\n" + " vec4 rgb = yuv_conv * yuv;\n" + " if (gamma != vec3(1.0, 1.0, 1.0))\n" + " rgb.rgb = pow(rgb.rgb, gamma);\n" + " rgb.a = %i == 0 ? 1.0 : texture2D(texs[3], tcv3).r;\n" + " gl_FragColor = rgb;\n" "}\n"; +static void detach_shader(GLuint prog, GLenum type) { + GLuint attached[4]; + GLsizei num_attached; + mpglGetAttachedShaders(prog, 4, &num_attached, attached); + while (num_attached--) { + GLint cur_type; + mpglGetShaderiv(attached[num_attached], GL_SHADER_TYPE, &cur_type); + if (cur_type == type) + mpglDetachShader(prog, attached[num_attached]); + } +} + static void set_frag_shader(GLuint prog, GLuint shader) { + detach_shader(prog, GL_FRAGMENT_SHADER); mpglAttachShader(prog, shader); mpglBindAttribLocation(prog, 0, "vPos"); mpglBindAttribLocation(prog, 1, "tca"); @@ -1668,6 +1695,23 @@ static void set_frag_src(GLuint prog, co mpglDeleteShader(shader); } +static void update_yuv_frag_src(const gl_conversion_params_t *params) { + char buffer[2000]; + float yuv2rgb[3][4]; + mp_get_yuv2rgb_coeffs(&params->csp_params, yuv2rgb); + snprintf(buffer, sizeof(buffer), yuv_frag_shader_template, + 1.0 / params->csp_params.rgamma, + 1.0 / params->csp_params.ggamma, + 1.0 / params->csp_params.bgamma, + params->csp_params.format == MP_CSP_XYZ ? 2.6 : 1.0, + yuv2rgb[0][0], yuv2rgb[1][0], yuv2rgb[2][0], + yuv2rgb[0][1], yuv2rgb[1][1], yuv2rgb[2][1], + yuv2rgb[0][2], yuv2rgb[1][2], yuv2rgb[2][2], + yuv2rgb[0][3], yuv2rgb[1][3], yuv2rgb[2][3], + params->is_planar, 0); + set_frag_src(gpu_yuv_sl_program, buffer); +} + static void GLAPIENTRY matrix_uniform(const float *matrix) { GLint loc; @@ -1736,6 +1780,7 @@ void glSetupYUVConversion(gl_conversion_ glSetupYUVFragprog(params); break; case YUV_CONVERSION_SL_PROGRAM: + update_yuv_frag_src(params); break; case YUV_CONVERSION_NONE: break; @@ -2440,7 +2485,6 @@ static int setGlWindow_egl(MPGLContext * gpu_def_sl_program = new_gpu_program(); gpu_yuv_sl_program = new_gpu_program(); set_frag_src(gpu_def_sl_program, def_frag_shader); - set_frag_src(gpu_yuv_sl_program, yuv_frag_shader); mpglLoadMatrixf = matrix_uniform; mpglColor4ub = dummy_color; mpglTexEnvi = dummy_texenvi; Modified: trunk/libvo/gl_compat.h ============================================================================== --- trunk/libvo/gl_compat.h Sat May 4 22:01:38 2013 (r36227) +++ trunk/libvo/gl_compat.h Sat May 4 22:01:40 2013 (r36228) @@ -419,6 +419,9 @@ #ifndef GL_VERTEX_SHADER #define GL_VERTEX_SHADER 0x8B31 #endif +#ifndef GL_SHADER_TYPE +#define GL_SHADER_TYPE 0x8B4F +#endif #ifndef GL_COMPILE_STATUS #define GL_COMPILE_STATUS 0x8B81 #endif

1 0

r36227 - in trunk/libvo: csputils.c csputils.h
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 22:01:38 2013 New Revision: 36227 Log: Add some forgotten "const" to function arguments. Modified: trunk/libvo/csputils.c trunk/libvo/csputils.h Modified: trunk/libvo/csputils.c ============================================================================== --- trunk/libvo/csputils.c Sat May 4 22:01:38 2013 (r36226) +++ trunk/libvo/csputils.c Sat May 4 22:01:38 2013 (r36227) @@ -61,7 +61,7 @@ void mp_gen_gamma_map(uint8_t *map, int * Note: contrast, hue and saturation will only work as expected with YUV formats, * not with e.g. MP_CSP_XYZ */ -void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float yuv2rgb[3][4]) { +void mp_get_yuv2rgb_coeffs(const struct mp_csp_params *params, float yuv2rgb[3][4]) { float depth_multiplier = params->input_shift >= 0 ? (1 << params->input_shift) : (1.0 / (1 << -params->input_shift)); @@ -151,7 +151,7 @@ static float int2pos(int i, int size) { * \param map where to store map. Must provide space for size^3 elements * \param size size of the map */ -void mp_gen_yuv2rgb_map(struct mp_csp_params *params, unsigned char *map, int size) { +void mp_gen_yuv2rgb_map(const struct mp_csp_params *params, unsigned char *map, int size) { int i, j, k, l; float yuv2rgb[3][4]; unsigned char gmaps[3][GMAP_SIZE]; Modified: trunk/libvo/csputils.h ============================================================================== --- trunk/libvo/csputils.h Sat May 4 22:01:38 2013 (r36226) +++ trunk/libvo/csputils.h Sat May 4 22:01:38 2013 (r36227) @@ -64,7 +64,7 @@ void mp_gen_gamma_map(unsigned char *map #define COL_U 1 #define COL_V 2 #define COL_C 3 -void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float yuv2rgb[3][4]); -void mp_gen_yuv2rgb_map(struct mp_csp_params *params, uint8_t *map, int size); +void mp_get_yuv2rgb_coeffs(const struct mp_csp_params *params, float yuv2rgb[3][4]); +void mp_gen_yuv2rgb_map(const struct mp_csp_params *params, uint8_t *map, int size); #endif /* MPLAYER_CSPUTILS_H */

1 0

r36226 - trunk/libvo/gl_common.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 22:01:38 2013 New Revision: 36226 Log: Add a const. It can help some compilers optimize. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 17:20:47 2013 (r36225) +++ trunk/libvo/gl_common.c Sat May 4 22:01:38 2013 (r36226) @@ -1639,7 +1639,7 @@ static const char yuv_frag_shader[] = "uniform sampler2D texs[4];\n" "varying vec2 tcv, tcv2;\n" "void main() {\n" - " mat4 yuv_conv = mat4(\n" + " const mat4 yuv_conv = mat4(\n" " 1.164000e+00, 1.164000e+00, 1.164000e+00, 0,\n" " 0.000000e+00, -3.910000e-01, 2.018000e+00, 0,\n" " 1.596000e+00, -8.130000e-01, 0.000000e+00, 0,\n"

1 0

r36225 - trunk/libvo/gl_common.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 17:20:47 2013 New Revision: 36225 Log: Provide dummy glColor4ub glTexEnvi functions. Avoids calling a NULL pointer with pure GLES implementations. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 17:20:46 2013 (r36224) +++ trunk/libvo/gl_common.c Sat May 4 17:20:47 2013 (r36225) @@ -2365,6 +2365,12 @@ static void *eglgpa(const GLubyte *name) return res; } +static void GLAPIENTRY dummy_color(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { +} + +static void GLAPIENTRY dummy_texenvi(GLenum t, GLenum p, GLint v) { +} + static int setGlWindow_egl(MPGLContext *ctx) { static const EGLint cfg_attribs[] = { EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_NONE }; @@ -2436,6 +2442,8 @@ static int setGlWindow_egl(MPGLContext * set_frag_src(gpu_def_sl_program, def_frag_shader); set_frag_src(gpu_yuv_sl_program, yuv_frag_shader); mpglLoadMatrixf = matrix_uniform; + mpglColor4ub = dummy_color; + mpglTexEnvi = dummy_texenvi; use_program(gpu_def_sl_program); // and inform that reinit is necessary

1 0

r36224 - in trunk/libvo: gl_common.c gl_common.h
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 17:20:46 2013 New Revision: 36224 Log: Remove unused mpglTexEnvf. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_common.h Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 17:20:45 2013 (r36223) +++ trunk/libvo/gl_common.c Sat May 4 17:20:46 2013 (r36224) @@ -58,7 +58,6 @@ void (GLAPIENTRY *mpglCallList)(GLuint); void (GLAPIENTRY *mpglCallLists)(GLsizei, GLenum, const GLvoid *); void (GLAPIENTRY *mpglGenTextures)(GLsizei, GLuint *); void (GLAPIENTRY *mpglDeleteTextures)(GLsizei, const GLuint *); -void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat); void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint); void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte); void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf); @@ -451,7 +450,6 @@ static const extfunc_desc_t extfuncs[] = DEF_FUNC_DESC(CallLists), DEF_FUNC_DESC(GenTextures), DEF_FUNC_DESC(DeleteTextures), - DEF_FUNC_DESC(TexEnvf), DEF_FUNC_DESC(TexEnvi), DEF_FUNC_DESC(Color4ub), DEF_FUNC_DESC(ClearColor), Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sat May 4 17:20:45 2013 (r36223) +++ trunk/libvo/gl_common.h Sat May 4 17:20:46 2013 (r36224) @@ -247,7 +247,6 @@ extern void (GLAPIENTRY *mpglCallList)(G extern void (GLAPIENTRY *mpglCallLists)(GLsizei, GLenum, const GLvoid *); extern void (GLAPIENTRY *mpglGenTextures)(GLsizei, GLuint *); extern void (GLAPIENTRY *mpglDeleteTextures)(GLsizei, const GLuint *); -extern void (GLAPIENTRY *mpglTexEnvf)(GLenum, GLenum, GLfloat); extern void (GLAPIENTRY *mpglTexEnvi)(GLenum, GLenum, GLint); extern void (GLAPIENTRY *mpglColor4ub)(GLubyte, GLubyte, GLubyte, GLubyte); extern void (GLAPIENTRY *mpglClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);

1 0

r36223 - in trunk/libvo: gl_common.c gl_common.h matrixview.c vo_gl.c vo_gl_tiled.c
by reimar 04 May '13

04 May '13

Author: reimar Date: Sat May 4 17:20:45 2013 New Revision: 36223 Log: Remove glMatrixMode and glLoadIdentity functions. They are not really necessary. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_common.h trunk/libvo/matrixview.c trunk/libvo/vo_gl.c trunk/libvo/vo_gl_tiled.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/gl_common.c Sat May 4 17:20:45 2013 (r36223) @@ -48,8 +48,6 @@ GLenum (GLAPIENTRY *mpglGetError)(void); void (GLAPIENTRY *mpglBegin)(GLenum); void (GLAPIENTRY *mpglEnd)(void); void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei); -void (GLAPIENTRY *mpglMatrixMode)(GLenum); -void (GLAPIENTRY *mpglLoadIdentity)(void); void (GLAPIENTRY *mpglLoadMatrixf)(const float *); void (GLAPIENTRY *mpglClear)(GLbitfield); GLuint (GLAPIENTRY *mpglGenLists)(GLsizei); @@ -443,8 +441,6 @@ static const extfunc_desc_t extfuncs[] = DEF_FUNC_DESC(Begin), DEF_FUNC_DESC(End), DEF_FUNC_DESC(Viewport), - DEF_FUNC_DESC(MatrixMode), - DEF_FUNC_DESC(LoadIdentity), DEF_FUNC_DESC(LoadMatrixf), DEF_FUNC_DESC(Clear), DEF_FUNC_DESC(GenLists), Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/gl_common.h Sat May 4 17:20:45 2013 (r36223) @@ -237,8 +237,6 @@ extern GLenum (GLAPIENTRY *mpglGetError) extern void (GLAPIENTRY *mpglBegin)(GLenum); extern void (GLAPIENTRY *mpglEnd)(void); extern void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei); -extern void (GLAPIENTRY *mpglMatrixMode)(GLenum); -extern void (GLAPIENTRY *mpglLoadIdentity)(void); extern void (GLAPIENTRY *mpglLoadMatrixf)(const float *); extern void (GLAPIENTRY *mpglClear)(GLbitfield); extern GLuint (GLAPIENTRY *mpglGenLists)(GLsizei); Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/matrixview.c Sat May 4 17:20:45 2013 (r36223) @@ -322,11 +322,7 @@ void matrixview_reshape(int w, int h) }; mpglViewport(0, 0, w, h); - mpglMatrixMode(GL_PROJECTION); mpglLoadMatrixf(matrix); - - mpglMatrixMode(GL_MODELVIEW); - mpglLoadIdentity(); } Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/vo_gl.c Sat May 4 17:20:45 2013 (r36223) @@ -194,7 +194,6 @@ static void resize(int x,int y){ } else mpglViewport( 0, 0, x, y ); - mpglMatrixMode(GL_PROJECTION); ass_border_x = ass_border_y = 0; if (aspect_scaling() && use_aspect) { int new_w, new_h; @@ -214,9 +213,6 @@ static void resize(int x,int y){ } mpglLoadMatrixf(video_matrix); - mpglMatrixMode(GL_MODELVIEW); - mpglLoadIdentity(); - if (!scaled_osd) { #ifdef CONFIG_FREETYPE // adjust font size to display size @@ -843,7 +839,6 @@ static void do_render_osd(int type) { 0, 0, 0, 0, -1, 1, 0, 1 }; - mpglMatrixMode(GL_PROJECTION); mpglLoadMatrixf(matrix); } mpglEnable(GL_BLEND); Modified: trunk/libvo/vo_gl_tiled.c ============================================================================== --- trunk/libvo/vo_gl_tiled.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/vo_gl_tiled.c Sat May 4 17:20:45 2013 (r36223) @@ -446,11 +446,7 @@ static void resize(int x,int y){ glViewport( 0, 0, x, y ); } - glMatrixMode(GL_PROJECTION); glLoadMatrixf(matrix); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); } static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){

1 0