[vlc-devel] Patch AudioQueue aout and OpenGL vout for iOS compatibility

[Ilkka Ollakka]

On Wed, Mar 21, 2012 at 07:54:56PM +0100, Felix Paul Kühne wrote:
> Hello,

> Feedback would be absolutely welcome.


> From 49437e16a369cc22da168bbcb82d61648cdb4b85 Mon Sep 17 00:00:00 2001
> From: Philippe Coent <philippe.coent at gmail.com>
> Date: Wed, 21 Mar 2012 19:37:11 +0100
> Subject: [PATCH 11/15] vout/opengl: fixed compilation for iOS


>      vgl->chroma = vlc_fourcc_GetChromaDescription(vgl->fmt.i_chroma);
> +#ifndef USE_OPENGL_ES
>      vgl->use_multitexture = vgl->chroma->plane_count > 1;
> +#endif

Don't think multitexture is used in USE_OPENGL_ES anyway

> +#ifndef USE_OPENGL_ES
>          if (vgl->program)
>              vgl->DeleteProgramsARB(1, &vgl->program);
> +#endif

I think vgl->program should be NULL in USE_OPENGL_ES too..

> +#ifndef USE_OPENGL_ES
>          if (vgl->use_multitexture)
>              vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);
> +#endif

Same for multitexture?

> +#ifndef USE_OPENGL_ES
>      if (vgl->program) {
>          glEnable(GL_FRAGMENT_PROGRAM_ARB);
>          for (int i = 0; i < vgl->local_count; i++)
> @@ -647,6 +684,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
>      } else {
>          glEnable(vgl->tex_target);
>      }
> +#endif

and vgl->program?

> +#ifndef USE_OPENGL_ES
>      if (vgl->program)
>          glDisable(GL_FRAGMENT_PROGRAM_ARB);
>      else
>          glDisable(vgl->tex_target);
> +#else
> +    glDisable(vgl->tex_target);
> +#endif

Boils in here, USE_OPENGL_ES should mean that vgl->program is NULL ?

-- 
Ilkka Ollakka
"A raccoon tangled with a 23,000 volt line today.  The results blacked
out 1400 homes and, of course, one raccoon."
		-- Steel City News
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20120321/37947853/attachment.sig>