[PATCH 0/2] MR149: Add const to a few variables.

[PATCH 1/2] vkd3d-shader/hlsl: Make a string array const.

[Zebediah Figura]

From: Zebediah Figura

---
 libs/vkd3d-shader/hlsl_codegen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 5d7e426f..e5c7bc46 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -2816,7 +2816,7 @@ static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functio

static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output)
 {
-    static const char *shader_names[] =
+    static const char *const shader_names[] =
     {
         [VKD3D_SHADER_TYPE_PIXEL] = "Pixel",
         [VKD3D_SHADER_TYPE_VERTEX] = "Vertex",

[PATCH 2/2] vkd3d-common: Make some global string variables const.

[Zebediah Figura]

From: Zebediah Figura

---
 include/private/vkd3d_debug.h | 2 +-
 libs/vkd3d-common/debug.c     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h
index 4f6d43af..6708cad3 100644
--- a/include/private/vkd3d_debug.h
+++ b/include/private/vkd3d_debug.h
@@ -91,7 +91,7 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size);

#define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN)

-#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name
+#define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name

static inline const char *debugstr_guid(const GUID *guid)
 {
diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c
index 499334a3..b363efbd 100644
--- a/libs/vkd3d-common/debug.c
+++ b/libs/vkd3d-common/debug.c
@@ -40,9 +40,9 @@
 #define VKD3D_DEBUG_BUFFER_COUNT 64
 #define VKD3D_DEBUG_BUFFER_SIZE 512

-extern const char *vkd3d_dbg_env_name;
+extern const char *const vkd3d_dbg_env_name;

-static const char *debug_level_names[] =
+static const char *const debug_level_names[] =
 {
     /* VKD3D_DBG_LEVEL_NONE  */ "none",
     /* VKD3D_DBG_LEVEL_ERR   */ "err",

[PATCH 0/2] MR149: Add const to a few variables. - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.

[PATCH 0/2] MR149: Add const to a few variables. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/2] MR149: Add const to a few variables. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.