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

Proposed by Alfonso Sanchez-Beato on 2017-02-14
Status: Merged
Approved by: Jim Hodapp on 2017-02-21
Approved revision: 73
Merged at revision: 72
Proposed branch: lp:~alfonsosanchezbeato/qtvideo-node/mir-desktop-enablement
Merge into: lp:qtvideo-node
Diff against target: 17 lines (+5/-1)
1 file modified
src/shadervideoshader.cpp (+5/-1)
To merge this branch: bzr merge lp:~alfonsosanchezbeato/qtvideo-node/mir-desktop-enablement
Reviewer Review Type Date Requested Status
Jim Hodapp (community) 2017-02-14 Approve on 2017-02-21
Review via email: mp+317179@code.launchpad.net

Commit message

Make shader work when GL_OES_EGL_image_external is not present.

Description of the change

Make shader work when GL_OES_EGL_image_external is not present.

To post a comment you must log in.
Jim Hodapp (jhodapp) :
review: Needs Information
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/shadervideoshader.cpp'
2--- src/shadervideoshader.cpp 2015-05-03 21:42:34 +0000
3+++ src/shadervideoshader.cpp 2017-02-14 10:30:44 +0000
4@@ -82,8 +82,12 @@
5 const char *ShaderVideoShader::fragmentShader() const
6 {
7 static const char *shader =
8- "#extension GL_OES_EGL_image_external : require \n"
9+ "#extension GL_OES_EGL_image_external : enable \n"
10+ "#ifdef GL_OES_EGL_image_external \n"
11 "uniform samplerExternalOES sTexture; \n"
12+ "#else \n"
13+ "uniform sampler2D sTexture; \n"
14+ "#endif \n"
15 "uniform lowp float opacity; \n"
16 "varying highp vec2 qt_TexCoord; \n"
17 "void main() \n"

Subscribers

People subscribed via source and target branches