summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-08-30 16:06:29 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-08-30 17:45:02 +0200
commit8641d5d729370b14f817a9e33446c38ace710429 (patch)
treebd4e9b5e1cc04f56d0205f7465a5ee3504a7ee94
parent9390edb119d28d18de6e38585f9160bb99b17fb6 (diff)
rhi: gl: Correctly report WideLines for OpenGL
In core profile contexts a line width other than 1 may not work as expected since it is deprecated in the core profile. Change-Id: I3fc33cf90c65156aa87d04f08518c9ddcfb62625 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--src/gui/rhi/qrhi.cpp3
-rw-r--r--src/gui/rhi/qrhigles2.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index 7ebac6d1bd..632bfd0b29 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -544,7 +544,8 @@ Q_LOGGING_CATEGORY(QRHI_LOG_INFO, "qt.rhi.general")
supported. When reported as not supported, the line width set on the
graphics pipeline state is ignored. This can always be false with some
backends (D3D11, Metal). With Vulkan, the value depends on the
- implementation.
+ implementation. With OpenGL, wide lines are not supported in core profile
+ contexts.
\value VertexShaderPointSize Indicates that the size of rasterized points
set via \c{gl_PointSize} in the vertex shader is taken into account. When
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index cd72a44b60..f8a63d482f 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -887,7 +887,7 @@ bool QRhiGles2::isFeatureSupported(QRhi::Feature feature) const
case QRhi::Compute:
return caps.compute;
case QRhi::WideLines:
- return true;
+ return !caps.coreProfile;
case QRhi::VertexShaderPointSize:
return true;
case QRhi::BaseVertex: