From e188a3d864a5310bf18c3ad759a12560013deb64 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 11 Apr 2016 14:49:12 +0200 Subject: Prefix GL-specific shader effect code Rename the C++ sources and classes. The QML type name remains the same. No changes in functionality. The shader effect, node, material (and uniform animator and particles and bits and pieces here and there...) are highly interconnected and do not follow the usual design practices for Quick and the scenegraph and the adaptation layer. Therefore while we aim for keeping full compatibility for GL apps, other backends will likely get a different ShaderEffect item implementation. The C++ class QQuickShaderEffect itself is currently a dummy with an unchanged API. It is not in use for now but forms the basis for the implementation for other backends. This will be covered in future commits. Change-Id: Ia39ce4b303f8f33e2f241d11e35fa62423e43127 Reviewed-by: Andy Nichols --- src/quick/items/items.pri | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/quick/items/items.pri') diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index ee58fef1c4..baa59cb7fd 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -74,6 +74,7 @@ HEADERS += \ $$PWD/qquickwindowmodule_p.h \ $$PWD/qquickshadereffectsource_p.h \ $$PWD/qquickshadereffectmesh_p.h \ + $$PWD/qquickshadereffect_p.h \ $$PWD/qquickrendercontrol.h \ $$PWD/qquickrendercontrol_p.h @@ -126,14 +127,15 @@ SOURCES += \ $$PWD/qquickwindowattached.cpp \ $$PWD/qquickshadereffectsource.cpp \ $$PWD/qquickshadereffectmesh.cpp \ + $$PWD/qquickshadereffect.cpp \ $$PWD/qquickrendercontrol.cpp # Items that depend on OpenGL Renderer contains(QT_CONFIG, opengl(es1|es2)?) { SOURCES += \ $$PWD/qquickopenglinfo.cpp \ - $$PWD/qquickshadereffect.cpp \ - $$PWD/qquickshadereffectnode.cpp \ + $$PWD/qquickopenglshadereffect.cpp \ + $$PWD/qquickopenglshadereffectnode.cpp \ $$PWD/qquickframebufferobject.cpp \ $$PWD/qquickspriteengine.cpp \ $$PWD/qquicksprite.cpp \ @@ -147,8 +149,8 @@ contains(QT_CONFIG, opengl(es1|es2)?) { $$PWD/qquicksprite_p.h \ $$PWD/qquickspritesequence_p.h \ $$PWD/qquickanimatedsprite_p.h \ - $$PWD/qquickshadereffect_p.h \ - $$PWD/qquickshadereffectnode_p.h \ + $$PWD/qquickopenglshadereffect_p.h \ + $$PWD/qquickopenglshadereffectnode_p.h \ $$PWD/qquickframebufferobject.h \ $$PWD/qquickitemgrabresult.h -- cgit v1.2.3