1dd8b5ceec
qrhi.h, qshader.h, qshaderdescription.h (and qshaderbaker.h from shadertools; done separately) become "RHI APIs", following the concept of QPA APIs. Mirror completely what is done for QPA headers, but using the "rhi" prefix for the headers. This involves updating syncqt to handle the new category of headers. (a note on the regex: matching everything starting with "qrhi" is not acceptable due to incorrectly matching existing and future headers, hence specifying the four header names explicitly) There is going to be one difference to QPA: the documentation for everything RHI is going to be public and part of the regular docs, not hidden with \internal. In addition to the header renaming and adding the comments and documentation notes and warnings, there is one significant change here: there is no longer a need to do API-specific includes, such as qrhid3d11[_p].h, qrhivulkan[_p].h, etc. These are simply merged into a single header that is then included from qrhi.h. This means that users within Qt, and any future applications can just do #include <rhi/qrhi.h> (or rhi/qshader.h if the QRhi stuff is not relevant), no other headers are needed. There are no changes to functionality in this patch. Only the documentation is expanded, quite a lot, to eliminate all qdoc warnings and make the generated API docs complete. An example, with a quite extensive doc page is added as well. Task-number: QTBUG-113331 Change-Id: I91c749826348f14320cb335b1c83e9d1ea2b1d8b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
60 lines
1.5 KiB
CMake
60 lines
1.5 KiB
CMake
# Copyright (C) 2023 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
cmake_minimum_required(VERSION 3.16)
|
|
project(rhiwindow LANGUAGES CXX)
|
|
|
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
|
set(INSTALL_EXAMPLESDIR "examples")
|
|
endif()
|
|
|
|
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/rhiwindow")
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS Core Gui)
|
|
|
|
qt_standard_project_setup()
|
|
|
|
qt_add_executable(rhiwindow
|
|
main.cpp
|
|
rhiwindow.cpp rhiwindow.h
|
|
)
|
|
|
|
set_target_properties(rhiwindow PROPERTIES
|
|
WIN32_EXECUTABLE TRUE
|
|
MACOSX_BUNDLE TRUE
|
|
)
|
|
|
|
target_link_libraries(rhiwindow PRIVATE
|
|
Qt6::Core
|
|
Qt6::Gui
|
|
Qt6::GuiPrivate
|
|
)
|
|
|
|
set_source_files_properties("shaders/prebuilt/color.vert.qsb"
|
|
PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
|
|
)
|
|
set_source_files_properties("shaders/prebuilt/color.frag.qsb"
|
|
PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
|
|
)
|
|
set_source_files_properties("shaders/prebuilt/quad.vert.qsb"
|
|
PROPERTIES QT_RESOURCE_ALIAS "quad.vert.qsb"
|
|
)
|
|
set_source_files_properties("shaders/prebuilt/quad.frag.qsb"
|
|
PROPERTIES QT_RESOURCE_ALIAS "quad.frag.qsb"
|
|
)
|
|
qt_add_resources(rhiwindow "rhiwindow"
|
|
PREFIX
|
|
"/"
|
|
FILES
|
|
"shaders/prebuilt/color.vert.qsb"
|
|
"shaders/prebuilt/color.frag.qsb"
|
|
"shaders/prebuilt/quad.vert.qsb"
|
|
"shaders/prebuilt/quad.frag.qsb"
|
|
)
|
|
|
|
install(TARGETS rhiwindow
|
|
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
|
|
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
|
|
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
|
|
)
|