AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GLCommon: Make use of std::array where applicable

This commit is contained in:
Lioncash 2020-06-18 12:00:31 -04:00
parent b781ca7b89
commit a0ec0d938f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/OpenGL/GLCommon.cpp
View File

@ -1,7 +1,7 @@
#include "GLCommon.h" #include "GLCommon.h"
#include <Common/Macros.h> #include <Common/Macros.h>
GLenum gBlendFactor[] = const std::array<GLenum, 8> gBlendFactor
{ {
GL_ZERO, // GX_BL_ZERO GL_ZERO, // GX_BL_ZERO
GL_ONE, // GX_BL_ONE GL_ONE, // GX_BL_ONE
@ -14,7 +14,7 @@ GLenum gBlendFactor[] =
}; };
GLenum gZMode[] = const std::array<GLenum, 7> gZMode
{ {
GL_NEVER, // GX_NEVER GL_NEVER, // GX_NEVER
GL_LESS, // GX_LESS GL_LESS, // GX_LESS

5
src/Core/OpenGL/GLCommon.h
View File

@ -3,6 +3,7 @@
#include <Common/BasicTypes.h> #include <Common/BasicTypes.h>
#include <GL/glew.h> #include <GL/glew.h>
#include <array>
enum class EBlendFactor enum class EBlendFactor
{ {
@ -29,8 +30,8 @@ enum class EPrimitiveType
Points = 0xB8 Points = 0xB8
}; };
extern GLenum gBlendFactor[]; extern const std::array<GLenum, 8> gBlendFactor;
extern GLenum gZMode[]; extern const std::array<GLenum, 7> gZMode;
GLenum GXPrimToGLPrim(EPrimitiveType Type); GLenum GXPrimToGLPrim(EPrimitiveType Type);
#endif // GLCOMMON_H #endif // GLCOMMON_H