diff options
| author | Massimo Callegari <massimocallegari@yahoo.it> | 2018-08-24 23:41:13 +0200 |
|---|---|---|
| committer | Massimo Callegari <massimocallegari@yahoo.it> | 2018-09-03 12:26:39 +0000 |
| commit | f844a2acbb7ecc4d7b1776d1d6eeb8feab7044f1 (patch) | |
| tree | b6081a7e762789765750703d273f930ccbf0de42 /src/qtmultimediaquicktools/qtmultimediaquicktools.qrc | |
| parent | c1ca9510af3c3c4134b717f1863651783e338a9e (diff) | |
Add OpenGL core profile support to QtMultimediaQuickTools
When requesting a OGL Core profile via QSurfaceFormat::setDefaultFormat (e.g. to use Qt3D advanced features),
it is no longer possible to render QML Video items. This is because the requested shaders should be _core versions.
This patch adds the core shaders so QtMultimedia stops whining, and bind textures with the proper
format, since GL_LUMINANCE and GL_LUMINANCE_ALPHA are no longer valid in OGL 4.
Task-number: QTBUG-51064
Change-Id: I909e01e7dc7be07549e9ecf0a6425b309af38ea1
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qtmultimediaquicktools.qrc')
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.qrc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.qrc b/src/qtmultimediaquicktools/qtmultimediaquicktools.qrc index d5efb1f3e..b8180e31f 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.qrc +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.qrc @@ -11,5 +11,17 @@ <file>shaders/triplanaryuvvideo.vert</file> <file>shaders/uyvyvideo.frag</file> <file>shaders/yuyvvideo.frag</file> + + <file>shaders/monoplanarvideo_core.vert</file> + <file>shaders/rgbvideo_core.frag</file> + <file>shaders/rgbvideo_swizzle_core.frag</file> + <file>shaders/rgbvideo_padded_core.vert</file> + <file>shaders/biplanaryuvvideo_core.frag</file> + <file>shaders/biplanaryuvvideo_core.vert</file> + <file>shaders/biplanaryuvvideo_swizzle_core.frag</file> + <file>shaders/triplanaryuvvideo_core.frag</file> + <file>shaders/triplanaryuvvideo_core.vert</file> + <file>shaders/uyvyvideo_core.frag</file> + <file>shaders/yuyvvideo_core.frag</file> </qresource> </RCC> |