From f844a2acbb7ecc4d7b1776d1d6eeb8feab7044f1 Mon Sep 17 00:00:00 2001 From: Massimo Callegari Date: Fri, 24 Aug 2018 23:41:13 +0200 Subject: 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 Reviewed-by: Christian Stromme --- src/qtmultimediaquicktools/qtmultimediaquicktools.qrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/qtmultimediaquicktools/qtmultimediaquicktools.qrc') 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 @@ shaders/triplanaryuvvideo.vert shaders/uyvyvideo.frag shaders/yuyvvideo.frag + + shaders/monoplanarvideo_core.vert + shaders/rgbvideo_core.frag + shaders/rgbvideo_swizzle_core.frag + shaders/rgbvideo_padded_core.vert + shaders/biplanaryuvvideo_core.frag + shaders/biplanaryuvvideo_core.vert + shaders/biplanaryuvvideo_swizzle_core.frag + shaders/triplanaryuvvideo_core.frag + shaders/triplanaryuvvideo_core.vert + shaders/uyvyvideo_core.frag + shaders/yuyvvideo_core.frag -- cgit v1.2.3