From 1906d225f99b06bdc88766c4d8d5fc4b92ee631b Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Thu, 22 Sep 2022 10:07:38 +0800 Subject: [PATCH] QtRhi: make two plain arrays inline and constexpr In the current case they can be inline and constexpr. Task-number: QTBUG-100485 Change-Id: I8c200c0a756edbff914c4be8ba08fe6afbd61114 Reviewed-by: Marc Mutz (cherry picked from commit f003e25258e0fd546abe5857f20b626f160beb81) Reviewed-by: Qt Cherry-pick Bot --- src/gui/rhi/cs_tdr_p.h | 2 +- src/gui/rhi/vs_test_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/rhi/cs_tdr_p.h b/src/gui/rhi/cs_tdr_p.h index 3e442de39cd..de444200a0e 100644 --- a/src/gui/rhi/cs_tdr_p.h +++ b/src/gui/rhi/cs_tdr_p.h @@ -70,7 +70,7 @@ ret // Approximately 5 instruction slots used #endif -const BYTE g_killDeviceByTimingOut[] = +inline constexpr BYTE g_killDeviceByTimingOut[] = { 68, 88, 66, 67, 217, 62, 220, 38, 136, 51, 86, 245, diff --git a/src/gui/rhi/vs_test_p.h b/src/gui/rhi/vs_test_p.h index e24472cd95b..5feaef7d38e 100644 --- a/src/gui/rhi/vs_test_p.h +++ b/src/gui/rhi/vs_test_p.h @@ -76,7 +76,7 @@ ret // Approximately 6 instruction slots used #endif -const BYTE g_testVertexShader[] = +inline constexpr BYTE g_testVertexShader[] = { 68, 88, 66, 67, 75, 198, 18, 149, 172, 244, 247, 123,