[Merge] lp:~alfonsosanchezbeato/qtvideo-node/mir-desktop-enablement into lp:qtvideo-node

[Alfonso Sanchez-Beato]

Diff comments:

> === modified file 'src/shadervideoshader.cpp'
> --- src/shadervideoshader.cpp	2015-05-03 21:42:34 +0000
> +++ src/shadervideoshader.cpp	2017-02-14 10:30:44 +0000
> @@ -82,8 +82,12 @@
>  const char *ShaderVideoShader::fragmentShader() const
>  {
>      static const char *shader =
> -        "#extension GL_OES_EGL_image_external : require      \n"
> +        "#extension GL_OES_EGL_image_external : enable       \n"
> +        "#ifdef GL_OES_EGL_image_external                    \n"

Correct, on desktop the GL driver what not happy with requiring GL_OES_EGL_image_external. Yes, I have tested this on phones (works, and I also checked that the extension is a must there).

>          "uniform samplerExternalOES sTexture;                \n"
> +        "#else                                               \n"
> +        "uniform sampler2D sTexture;                         \n"
> +        "#endif                                              \n"
>          "uniform lowp float opacity;                         \n"
>          "varying highp vec2 qt_TexCoord;                     \n"
>          "void main()                                         \n"


-- 
https://code.launchpad.net/~alfonsosanchezbeato/qtvideo-node/mir-desktop-enablement/+merge/317179
Your team Ubuntu Phablet Team is subscribed to branch lp:qtvideo-node.