diff --git a/playground/parrots/CMakeLists.txt b/playground/parrots/CMakeLists.txt index 702fb82b..4083fcf9 100644 --- a/playground/parrots/CMakeLists.txt +++ b/playground/parrots/CMakeLists.txt @@ -9,6 +9,36 @@ set(SOURCES TextureFilterNode.h TextureFilterNode.cpp main.cpp) -qt_add_resources(SOURCES images.qrc shaders.qrc) +qt_add_resources(SOURCES images.qrc) + +if (QT_VERSION_MAJOR VERSION_LESS 6) + qt_add_resources(SOURCES shaders.qrc) +endif() qsk_add_example(parrots ${SOURCES}) + +if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) + + qt6_add_shaders(parrots "shaders" + + BATCHABLE + PRECOMPILE + + QUIET + + PREFIX + "/shaders" + + FILES + shaders/blur-vulkan.vert + shaders/blur-vulkan.frag + shaders/rgbswap-vulkan.frag + + OUTPUTS + blur.vert.qsb + blur.frag.qsb + rgbswap.vert.qsb + ) + +endif() + diff --git a/playground/parrots/shaders.qrc b/playground/parrots/shaders.qrc index 15150193..c9987e8c 100644 --- a/playground/parrots/shaders.qrc +++ b/playground/parrots/shaders.qrc @@ -4,9 +4,5 @@ shaders/blur.vert shaders/blur.frag shaders/rgbswap.frag - - shaders/blur.vert.qsb - shaders/blur.frag.qsb - shaders/rgbswap.frag.qsb diff --git a/playground/parrots/shaders/blur.frag.qsb b/playground/parrots/shaders/blur.frag.qsb deleted file mode 100644 index 9d04e783..00000000 Binary files a/playground/parrots/shaders/blur.frag.qsb and /dev/null differ diff --git a/playground/parrots/shaders/blur.vert.qsb b/playground/parrots/shaders/blur.vert.qsb deleted file mode 100644 index 018f8b19..00000000 Binary files a/playground/parrots/shaders/blur.vert.qsb and /dev/null differ diff --git a/playground/parrots/shaders/rgbswap.frag.qsb b/playground/parrots/shaders/rgbswap.frag.qsb deleted file mode 100644 index fdf07283..00000000 Binary files a/playground/parrots/shaders/rgbswap.frag.qsb and /dev/null differ