From 23dbe3d6e0d3338812ad9f614028a6fdc5a54090 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 13 Oct 2020 11:59:14 +0200 Subject: Promote suffixless names in GraphicsApi From API review. Change-Id: I3cda6f4b4e5a2e33356e7af4f7720e0b019b546d Reviewed-by: Andy Nichols --- src/quick/scenegraph/coreapi/qsgrendererinterface.cpp | 16 ++++++++++------ src/quick/scenegraph/coreapi/qsgrendererinterface.h | 17 +++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) (limited to 'src/quick/scenegraph') diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp index efbab4086c..31067f98bd 100644 --- a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp +++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp @@ -75,13 +75,17 @@ QT_BEGIN_NAMESPACE \enum QSGRendererInterface::GraphicsApi \value Unknown An unknown graphics API is in use \value Software The Qt Quick 2D Renderer is in use - \value OpenGL OpenGL ES 2.0 or higher \value OpenVG OpenVG via EGL - \value OpenGLRhi OpenGL ES 2.0 or higher via a graphics abstraction layer. This value was introduced in Qt 5.14. - \value Direct3D11Rhi Direct3D 11 via a graphics abstraction layer. This value was introduced in Qt 5.14. - \value VulkanRhi Vulkan 1.0 via a graphics abstraction layer. This value was introduced in Qt 5.14. - \value MetalRhi Metal via a graphics abstraction layer. This value was introduced in Qt 5.14. - \value NullRhi Null (no output) via a graphics abstraction layer. This value was introduced in Qt 5.14. + \value OpenGL OpenGL ES 2.0 or higher via a graphics abstraction layer. This value was introduced in Qt 5.14. + \value Direct3D11 Direct3D 11 via a graphics abstraction layer. This value was introduced in Qt 5.14. + \value Vulkan Vulkan 1.0 via a graphics abstraction layer. This value was introduced in Qt 5.14. + \value Metal Metal via a graphics abstraction layer. This value was introduced in Qt 5.14. + \value Null Null (no output) via a graphics abstraction layer. This value was introduced in Qt 5.14. + \omitvalue OpenGLRhi + \omitvalue Direct3D11Rhi + \omitvalue VulkanRhi + \omitvalue MetalRhi + \omitvalue NullRhi */ /*! diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.h b/src/quick/scenegraph/coreapi/qsgrendererinterface.h index c001ecc2db..ec5172e569 100644 --- a/src/quick/scenegraph/coreapi/qsgrendererinterface.h +++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.h @@ -52,13 +52,18 @@ public: enum GraphicsApi { Unknown, Software, - OpenGL, OpenVG, - OpenGLRhi, - Direct3D11Rhi, - VulkanRhi, - MetalRhi, - NullRhi, + OpenGL, + Direct3D11, + Vulkan, + Metal, + Null, + + OpenGLRhi = OpenGL, + Direct3D11Rhi = Direct3D11, + VulkanRhi = Vulkan, + MetalRhi = Metal, + NullRhi = Null }; enum Resource { -- cgit v1.2.3