diff --git a/MG/Constants.h b/MG/Constants.h index da68874a..38d00d72 100644 --- a/MG/Constants.h +++ b/MG/Constants.h @@ -43,10 +43,15 @@ namespace MG_Constants { inline constexpr int LOG_TARGET_FILE = 0x02; inline constexpr int LOG_TARGET_ANDROID = 0x04; // Android logcat inline constexpr int LOG_TARGET_ALL = LOG_TARGET_CONSOLE | LOG_TARGET_FILE | LOG_TARGET_ANDROID; + + template + bool Contains(T item, const std::vector vec) { + return std::find(vec.begin(), vec.end(), item) != vec.end(); + } } namespace Blend { - static const MG_Global::unordered_set VALID_FACTORS = { + static const std::vector VALID_FACTORS = { GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, @@ -55,45 +60,45 @@ namespace MG_Constants { } namespace Depth { - static const MG_Global::unordered_set VALID_FUNCS = { + static const std::vector VALID_FUNCS = { GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL, GL_GREATER, GL_NOTEQUAL, GL_GEQUAL, GL_ALWAYS }; // OpenGL 3 } namespace CommonState { - static const MG_Global::unordered_set VALID_CAPS = { + static const std::vector VALID_CAPS = { GL_BLEND, GL_DEPTH_TEST, GL_STENCIL_TEST, GL_SCISSOR_TEST, GL_CULL_FACE, GL_POLYGON_OFFSET_FILL, GL_SAMPLE_ALPHA_TO_COVERAGE, GL_SAMPLE_COVERAGE }; // OpenGL 3 } namespace Framebuffer { - static const MG_Global::unordered_set VALID_ATTACHMENTS = { + static const std::vector VALID_ATTACHMENTS = { GL_COLOR_ATTACHMENT0, GL_DEPTH_ATTACHMENT, GL_STENCIL_ATTACHMENT, GL_DEPTH_STENCIL_ATTACHMENT }; // OpenGL 3 - static const MG_Global::unordered_set VALID_TARGETS = { + static const std::vector VALID_TARGETS = { GL_FRAMEBUFFER, GL_DRAW_FRAMEBUFFER, GL_READ_FRAMEBUFFER }; // OpenGL 3 - static const MG_Global::unordered_set VALID_ACCESS = { + static const std::vector VALID_ACCESS = { GL_READ_ONLY, GL_WRITE_ONLY, GL_READ_WRITE }; // OpenGL 3 } namespace Buffer { - static const MG_Global::unordered_set VALID_PARAM_NAMES = { + static const std::vector VALID_PARAM_NAMES = { GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, GL_BUFFER_USAGE }; // OpenGL 3 - static const MG_Global::unordered_set VALID_TARGETS = { + static const std::vector VALID_TARGETS = { GL_ARRAY_BUFFER, GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, GL_PIXEL_UNPACK_BUFFER, GL_TEXTURE_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER, GL_UNIFORM_BUFFER }; // OpenGL 3 - static const MG_Global::unordered_set VALID_ACCESS = { + static const std::vector VALID_ACCESS = { GL_READ_ONLY, GL_WRITE_ONLY, GL_READ_WRITE }; // OpenGL 3 } @@ -122,7 +127,7 @@ namespace MG_Constants { {GL_UNPACK_ALIGNMENT, 4} }; // OpenGL 3 - static const MG_Global::unordered_set VALID_PARAM_NAMES = { + static const std::vector VALID_PARAM_NAMES = { GL_PACK_SWAP_BYTES, GL_PACK_LSB_FIRST, GL_PACK_ROW_LENGTH, GL_PACK_IMAGE_HEIGHT, GL_PACK_SKIP_ROWS, GL_PACK_SKIP_PIXELS, GL_PACK_SKIP_IMAGES, GL_PACK_ALIGNMENT, GL_UNPACK_SWAP_BYTES, GL_UNPACK_LSB_FIRST, GL_UNPACK_ROW_LENGTH, @@ -136,18 +141,18 @@ namespace MG_Constants { inline const GLuint MAX_TEXTURE_UNITS = 80; const GLsizei MAX_TEXTURE_SIZE = 32768; const GLsizei MAX_ARRAY_LAYERS = 256; - inline const MG_Global::unordered_set VALID_TARGETS = { + inline const std::vector VALID_TARGETS = { GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_1D_ARRAY, GL_PROXY_TEXTURE_1D_ARRAY, GL_TEXTURE_RECTANGLE, GL_PROXY_TEXTURE_RECTANGLE, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, GL_PROXY_TEXTURE_CUBE_MAP }; // OpenGL 3 - inline const MG_Global::unordered_set VALID_FORMATS = { + inline const std::vector VALID_FORMATS = { GL_RED, GL_RG, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_DEPTH_COMPONENT, GL_DEPTH_STENCIL }; // OpenGL 3 - inline const MG_Global::unordered_set VALID_INTERNAL_FORMATS = { + inline const std::vector VALID_INTERNAL_FORMATS = { GL_RED, GL_RG, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_DEPTH_COMPONENT, GL_DEPTH_STENCIL, GL_RGBA32F, GL_RGBA32I, GL_RGBA32UI, GL_RGBA16, GL_RGBA16F, GL_RGBA16I, GL_RGBA16UI, GL_RGBA8, GL_RGBA8UI, GL_SRGB8_ALPHA8, GL_RGB10_A2, GL_RGB10_A2UI, @@ -162,7 +167,7 @@ namespace MG_Constants { GL_DEPTH32F_STENCIL8, GL_DEPTH24_STENCIL8 }; // OpenGL 3 - inline const MG_Global::unordered_set VALID_TYPES = { + inline const std::vector VALID_TYPES = { GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, @@ -170,14 +175,14 @@ namespace MG_Constants { GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, GL_UNSIGNED_INT_2_10_10_10_REV }; // OpenGL 3 - inline const MG_Global::unordered_set VALID_TEXTURE_PARAM_NAMES = { + inline const std::vector VALID_TEXTURE_PARAM_NAMES = { GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_COMPARE_FUNC, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_SWIZZLE_R, GL_TEXTURE_SWIZZLE_G, GL_TEXTURE_SWIZZLE_B, GL_TEXTURE_SWIZZLE_A, GL_TEXTURE_SWIZZLE_RGBA, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_LOD_BIAS, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BORDER_COLOR }; // OpenGL 3 - inline const MG_Global::unordered_set VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES = { + inline const std::vector VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES = { GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT, GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE, GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, GL_TEXTURE_COMPRESSED_IMAGE_SIZE diff --git a/MG/MG_GL/State/Buffer/BufferState.cpp b/MG/MG_GL/State/Buffer/BufferState.cpp index c5cd3e2e..651bd3b3 100644 --- a/MG/MG_GL/State/Buffer/BufferState.cpp +++ b/MG/MG_GL/State/Buffer/BufferState.cpp @@ -263,8 +263,9 @@ GLenum BufferState::DeleteN(GLsizei n, const GLuint* buffers) { } bool BufferState::IsValidTarget_(GLenum target) { - MG_Util::Debug::LogD("MG_State: Buffer: IsValidTarget_ called with target=0x%x,result=%d", target, !(MG_Constants::Buffer::VALID_TARGETS.find(target) == MG_Constants::Buffer::VALID_TARGETS.end())); - return !(MG_Constants::Buffer::VALID_TARGETS.find(target) == MG_Constants::Buffer::VALID_TARGETS.end()); + bool ret = MG_Constants::Common::Contains(target, MG_Constants::Buffer::VALID_TARGETS); + MG_Util::Debug::LogD("MG_State: Buffer: IsValidTarget_ called with target=0x%x,result=%d", target, ret); + return ret; } GLenum BufferState::QueryPropertyIntVector(GLenum target, GLenum pname, GLint* params) const { @@ -277,7 +278,7 @@ GLenum BufferState::QueryPropertyIntVector(GLenum target, GLenum pname, GLint* p return GL_INVALID_ENUM; } - if (MG_Constants::Buffer::VALID_PARAM_NAMES.find(pname) == MG_Constants::Buffer::VALID_PARAM_NAMES.end()) { + if (!MG_Constants::Common::Contains(pname, MG_Constants::Buffer::VALID_PARAM_NAMES)) { return GL_INVALID_ENUM; } diff --git a/MG/MG_GL/State/Common/CommonState.cpp b/MG/MG_GL/State/Common/CommonState.cpp index 26b214ee..f9c61cef 100644 --- a/MG/MG_GL/State/Common/CommonState.cpp +++ b/MG/MG_GL/State/Common/CommonState.cpp @@ -10,7 +10,7 @@ CommonState::CommonState() { } GLenum CommonState::SetPixelStoreInt(GLenum pname, GLint param) { - if (MG_Constants::PixelStore::VALID_PARAM_NAMES.find(pname) == MG_Constants::PixelStore::VALID_PARAM_NAMES.end()) { + if (!MG_Constants::Common::Contains(pname, MG_Constants::PixelStore::VALID_PARAM_NAMES)) { return GL_INVALID_ENUM; } @@ -61,7 +61,7 @@ GLint CommonState::QueryPixelStoreInt(GLenum pname) { } GLenum CommonState::Enable(GLenum cap) { - if (MG_Constants::CommonState::VALID_CAPS.find(cap) == MG_Constants::CommonState::VALID_CAPS.end()) { + if (!MG_Constants::Common::Contains(cap, MG_Constants::CommonState::VALID_CAPS)) { return GL_INVALID_ENUM; } capabilities[cap] = true; @@ -69,7 +69,7 @@ GLenum CommonState::Enable(GLenum cap) { } GLenum CommonState::Disable(GLenum cap) { - if (MG_Constants::CommonState::VALID_CAPS.find(cap) == MG_Constants::CommonState::VALID_CAPS.end()) { + if (!MG_Constants::Common::Contains(cap, MG_Constants::CommonState::VALID_CAPS)) { return GL_INVALID_ENUM; } capabilities[cap] = false; @@ -77,8 +77,8 @@ GLenum CommonState::Disable(GLenum cap) { } GLenum CommonState::BlendFunc(GLenum sfactor, GLenum dfactor) { - if (MG_Constants::Blend::VALID_FACTORS.find(sfactor) == MG_Constants::Blend::VALID_FACTORS.end() || - MG_Constants::Blend::VALID_FACTORS.find(dfactor) == MG_Constants::Blend::VALID_FACTORS.end()) { + if (!MG_Constants::Common::Contains(sfactor, MG_Constants::Blend::VALID_FACTORS) || + !MG_Constants::Common::Contains(dfactor, MG_Constants::Blend::VALID_FACTORS)) { return GL_INVALID_ENUM; } @@ -89,10 +89,10 @@ GLenum CommonState::BlendFunc(GLenum sfactor, GLenum dfactor) { GLenum CommonState::BlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) { - if (MG_Constants::Blend::VALID_FACTORS.find(srcRGB) == MG_Constants::Blend::VALID_FACTORS.end() || - MG_Constants::Blend::VALID_FACTORS.find(dstRGB) == MG_Constants::Blend::VALID_FACTORS.end() || - MG_Constants::Blend::VALID_FACTORS.find(srcAlpha) == MG_Constants::Blend::VALID_FACTORS.end() || - MG_Constants::Blend::VALID_FACTORS.find(dstAlpha) == MG_Constants::Blend::VALID_FACTORS.end()) { + if (!MG_Constants::Common::Contains(srcRGB, MG_Constants::Blend::VALID_FACTORS) || + !MG_Constants::Common::Contains(dstRGB, MG_Constants::Blend::VALID_FACTORS) || + !MG_Constants::Common::Contains(srcAlpha, MG_Constants::Blend::VALID_FACTORS) || + !MG_Constants::Common::Contains(dstAlpha, MG_Constants::Blend::VALID_FACTORS)) { return GL_INVALID_ENUM; } blendSrcRGB = srcRGB; @@ -133,7 +133,7 @@ GLenum CommonState::ColorMask(GLboolean red, GLboolean green, GLboolean blue, GL } GLenum CommonState::DepthFunc(GLenum func) { - if (MG_Constants::Depth::VALID_FUNCS.find(func) == MG_Constants::Depth::VALID_FUNCS.end()) { + if (!MG_Constants::Common::Contains(func, MG_Constants::Depth::VALID_FUNCS)) { return GL_INVALID_ENUM; } depthFunc = func; diff --git a/MG/MG_GL/State/Framebuffer/FramebufferState.cpp b/MG/MG_GL/State/Framebuffer/FramebufferState.cpp index c14e62ef..ccd9a169 100644 --- a/MG/MG_GL/State/Framebuffer/FramebufferState.cpp +++ b/MG/MG_GL/State/Framebuffer/FramebufferState.cpp @@ -42,7 +42,7 @@ GLenum FramebufferState::Delete(GLuint framebuffer) { } GLenum FramebufferState::Bind(GLenum target, GLuint framebuffer) { - if (MG_Constants::Framebuffer::VALID_TARGETS.find(target) == MG_Constants::Framebuffer::VALID_TARGETS.end()) + if (!MG_Constants::Common::Contains(target, MG_Constants::Framebuffer::VALID_TARGETS)) return GL_INVALID_ENUM; if (framebuffer != 0 && !ValidateHandle(framebuffer)) return GL_INVALID_OPERATION; @@ -57,8 +57,8 @@ GLenum FramebufferState::Bind(GLenum target, GLuint framebuffer) { GLenum FramebufferState::AttachTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { - if (MG_Constants::Framebuffer::VALID_ATTACHMENTS.find(attachment) == MG_Constants::Framebuffer::VALID_ATTACHMENTS.end() || - MG_Constants::Texture::VALID_TARGETS.find(textarget) == MG_Constants::Texture::VALID_TARGETS.end()) + if (!MG_Constants::Common::Contains(attachment, MG_Constants::Framebuffer::VALID_ATTACHMENTS) || + !MG_Constants::Common::Contains(textarget, MG_Constants::Texture::VALID_TARGETS)) return GL_INVALID_ENUM; if (target == GL_FRAMEBUFFER) { target = GL_DRAW_FRAMEBUFFER; diff --git a/MG/MG_GL/State/Texture/TextureState.cpp b/MG/MG_GL/State/Texture/TextureState.cpp index 1858cd74..815f2256 100644 --- a/MG/MG_GL/State/Texture/TextureState.cpp +++ b/MG/MG_GL/State/Texture/TextureState.cpp @@ -121,7 +121,7 @@ GLenum TextureState::CreateN(GLsizei n, GLuint* textures) { GLenum TextureState::Bind(GLenum target, GLuint texture) { MG_Util::Debug::LogD("MG_State: Texture: Bind called with target=0x%x, texture=%u", target, texture); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: Bind invalid target=0x%x", target); return GL_INVALID_ENUM; } @@ -497,12 +497,12 @@ GLenum TextureState::UpdateRegion2D(GLenum target, GLint level, GLint xoffset, GLenum TextureState::SetTexturePropertyFloat(GLenum target, GLenum pname, GLfloat param) { MG_Util::Debug::LogD("MG_State: Texture: SetTexturePropertyFloat called target=0x%x, pname=0x%x, param=%f", target, pname, param); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: SetTexturePropertyFloat invalid target=0x%x", target); return GL_INVALID_ENUM; } - if (MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES.find(pname) == MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES.end()) { + if (!MG_Constants::Common::Contains(pname, MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES)) { MG_Util::Debug::LogE("MG_State: Texture: SetTexturePropertyFloat invalid pname=0x%x", pname); return GL_INVALID_ENUM; } @@ -549,12 +549,12 @@ GLenum TextureState::SetTexturePropertyFloat(GLenum target, GLenum pname, GLfloa GLenum TextureState::SetTexturePropertyInt(GLenum target, GLenum pname, GLint param) { MG_Util::Debug::LogD("MG_State: Texture: SetTexturePropertyInt called target=0x%x, pname=0x%x, param=%d", target, pname, param); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: SetTexturePropertyInt invalid target=0x%x", target); return GL_INVALID_ENUM; } - if (MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES.find(pname) == MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES.end()) { + if (!MG_Constants::Common::Contains(pname, MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES)) { MG_Util::Debug::LogE("MG_State: Texture: SetTexturePropertyInt invalid pname=0x%x", pname); return GL_INVALID_ENUM; } @@ -645,7 +645,7 @@ GLenum TextureState::DeleteN(GLsizei n, const GLuint* textures) { GLenum TextureState::QueryLevelPropertyIntVector(GLenum target, GLint level, GLenum pname, GLint* params) { MG_Util::Debug::LogD("MG_State: Texture: QueryLevelPropertyIntVector called target=0x%x, level=%d, pname=0x%x", target, level, pname); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: QueryLevelPropertyIntVector invalid target=0x%x", target); return GL_INVALID_ENUM; } @@ -655,7 +655,7 @@ GLenum TextureState::QueryLevelPropertyIntVector(GLenum target, GLint level, GLe return GL_INVALID_VALUE; } - if (MG_Constants::Texture::VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES.find(pname) == MG_Constants::Texture::VALID_QUERY_LEVEL_PROPERTY_PARAM_NAMES.end()) { + if (!MG_Constants::Common::Contains(pname, MG_Constants::Texture::VALID_TEXTURE_PARAM_NAMES)) { MG_Util::Debug::LogE("MG_State: Texture: QueryLevelPropertyIntVector invalid pname=0x%x", pname); return GL_INVALID_ENUM; } @@ -805,7 +805,7 @@ GLenum TextureState::CheckUploadingTexture2DValidity_(GLenum target, GLint level GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* data) { MG_Util::Debug::LogD("MG_State: Texture: CheckUploadingTexture2DValidity_ called target=0x%x, level=%d", target, level); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUploadingTexture2DValidity_ invalid target=0x%x", target); return GL_INVALID_ENUM; } @@ -845,17 +845,17 @@ GLenum TextureState::CheckUploadingTexture2DValidity_(GLenum target, GLint level return GL_INVALID_VALUE; } - if (MG_Constants::Texture::VALID_INTERNAL_FORMATS.find(internalFormat) == MG_Constants::Texture::VALID_INTERNAL_FORMATS.end()) { + if (!MG_Constants::Common::Contains((GLenum)internalFormat, MG_Constants::Texture::VALID_INTERNAL_FORMATS)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUploadingTexture2DValidity_ invalid internalFormat=0x%x", internalFormat); return GL_INVALID_VALUE; } - if (MG_Constants::Texture::VALID_FORMATS.find(format) == MG_Constants::Texture::VALID_FORMATS.end()) { + if (!MG_Constants::Common::Contains((GLenum)format, MG_Constants::Texture::VALID_FORMATS)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUploadingTexture2DValidity_ invalid format=0x%x", format); return GL_INVALID_ENUM; } - if (MG_Constants::Texture::VALID_TYPES.find(type) == MG_Constants::Texture::VALID_TYPES.end()) { + if (!MG_Constants::Common::Contains((GLenum)type, MG_Constants::Texture::VALID_TYPES)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUploadingTexture2DValidity_ invalid type=0x%x", type); return GL_INVALID_ENUM; } @@ -927,7 +927,7 @@ GLenum TextureState::CheckUpdatingTextureRegion2DValidity_(GLenum target, GLint MG_Util::Debug::LogD("MG_State: Texture: CheckUpdatingTextureRegion2DValidity_ called target=0x%x, level=%d, x=%d, y=%d, w=%d, h=%d", target, level, xoffset, yoffset, width, height); - if (MG_Constants::Texture::VALID_TARGETS.find(target) == MG_Constants::Texture::VALID_TARGETS.end()) { + if (!MG_Constants::Common::Contains(target, MG_Constants::Texture::VALID_TARGETS)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUpdatingTextureRegion2DValidity_ invalid target=0x%x", target); return GL_INVALID_ENUM; } @@ -977,12 +977,12 @@ GLenum TextureState::CheckUpdatingTextureRegion2DValidity_(GLenum target, GLint return GL_INVALID_OPERATION; } - if (MG_Constants::Texture::VALID_FORMATS.find(format) == MG_Constants::Texture::VALID_FORMATS.end()) { + if (!MG_Constants::Common::Contains(format, MG_Constants::Texture::VALID_FORMATS)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUpdatingTextureRegion2DValidity_ invalid format=0x%x", format); return GL_INVALID_ENUM; } - if (MG_Constants::Texture::VALID_TYPES.find(type) == MG_Constants::Texture::VALID_TYPES.end()) { + if (!MG_Constants::Common::Contains(type, MG_Constants::Texture::VALID_TYPES)) { MG_Util::Debug::LogE("MG_State: Texture: CheckUpdatingTextureRegion2DValidity_ invalid type=0x%x", type); return GL_INVALID_ENUM; }