Make immutable array const #577

from Hinara/patch-3
Drewol · Apr 18, 2022 · 3f150aa · 3f150aa
2 parents 6cc2bd5 + 8205137
commit 3f150aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Graphics/include/Graphics/Shader.hpp b/Graphics/include/Graphics/Shader.hpp
@@ -3,6 +3,9 @@
 
 namespace Graphics
 {
+#ifndef EMBEDDED
+	extern const uint32 shaderStageMap[];
+#endif
 	/* Enum of supported shader types */
 	enum class ShaderType
 	{

diff --git a/Graphics/src/Material.cpp b/Graphics/src/Material.cpp
@@ -57,9 +57,6 @@ namespace Graphics
 	{
 	};
 
-	// Defined in Shader.cpp
-	extern uint32 shaderStageMap[];
-
 	class Material_Impl : public MaterialRes
 	{
 	public:

diff --git a/Graphics/src/Shader.cpp b/Graphics/src/Shader.cpp
@@ -6,19 +6,19 @@
 namespace Graphics
 {
 #ifdef EMBEDDED
-	uint32 typeMap[] =
+	const uint32 typeMap[] =
 	{
 		GL_VERTEX_SHADER,
 		GL_FRAGMENT_SHADER,
 	};
 #else
-	uint32 typeMap[] =
+	const uint32 typeMap[] =
 	{
 		GL_VERTEX_SHADER,
 		GL_FRAGMENT_SHADER,
 		GL_GEOMETRY_SHADER,
 	};
-	uint32 shaderStageMap[] =
+	const uint32 shaderStageMap[] =
 	{
 		GL_VERTEX_SHADER_BIT,
 		GL_FRAGMENT_SHADER_BIT,