diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-04-28 18:35:38 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-04-30 09:02:20 +0000 |
commit | fe13f5bb05ef278eb5109a9518118dda7ddb0b9d (patch) | |
tree | 167e3b090efb82e41dac6fd2cd8fd5504a72a60b /src/qtmultimediaquicktools/qtmultimediaquicktools.pro | |
parent | 61033aa420b4d34107e3cc67e8751506bc4ab745 (diff) |
Minor refactor of built-in QSGVideoNodes.v5.5.0-beta1
- Load shader source from resource files.
- Correctly report material types: each material can use different
shaders depending on the video pixel format but it was reporting
a unique material type. This was causing the node to keep using
the same shader even if its pixel format changed.
Change-Id: Ib903ecd6e7dd1dd56d7cefe255ab7049933df17d
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/qtmultimediaquicktools/qtmultimediaquicktools.pro')
-rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 917a5ac27..61c5f7b20 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -32,3 +32,17 @@ HEADERS += \ qsgvideonode_yuv.h \ qsgvideonode_rgb.h \ qsgvideonode_texture.h + +RESOURCES += \ + qtmultimediaquicktools.qrc + +OTHER_FILES += \ + shaders/rgbvideo.vert \ + shaders/rgbvideo_padded.vert \ + shaders/rgbvideo.frag \ + shaders/rgbvideo_swizzle.frag \ + shaders/biplanaryuvvideo.vert \ + shaders/biplanaryuvvideo.frag \ + shaders/biplanaryuvvideo_swizzle.frag \ + shaders/triplanaryuvvideo.vert \ + shaders/triplanaryuvvideo.frag |