diff --git a/MobileGL/MG_Backend/DirectGLES/Utils.cpp b/MobileGL/MG_Backend/DirectGLES/Utils.cpp
index 896367e3..5d048156 100644
--- a/MobileGL/MG_Backend/DirectGLES/Utils.cpp
+++ b/MobileGL/MG_Backend/DirectGLES/Utils.cpp
@@ -143,20 +143,19 @@ namespace MobileGL::MG_Backend::DirectGLES {
                 if (outType) *outType = GL_UNSIGNED_INT;
                 if (outFormat) switch (internalFormat) {
                     case GL_RGBA32UI:
-                        if (outFormat) *outFormat = GL_RGBA;
+                        if (outFormat) *outFormat = GL_RGBA_INTEGER;
                         break;
                     case GL_RGB32UI:
-                        if (outFormat) *outFormat = GL_RGB;
+                        if (outFormat) *outFormat = GL_RGB_INTEGER;
                         break;
                     case GL_RG32UI:
-                        if (outFormat) *outFormat = GL_RG;
+                        if (outFormat) *outFormat = GL_RG_INTEGER;
                         break;
                     case GL_R32UI:
-                        if (outFormat) *outFormat = GL_RED;
+                        if (outFormat) *outFormat = GL_RED_INTEGER;
                         break;
                     }
                 break;
-                break;
 
             case GL_RGBA32I:
             case GL_RGB32I:
@@ -166,16 +165,16 @@ namespace MobileGL::MG_Backend::DirectGLES {
                 if (outType) *outType = GL_INT;
                 if (outFormat) switch (internalFormat) {
                     case GL_RGBA32I:
-                        if (outFormat) *outFormat = GL_RGBA;
+                        if (outFormat) *outFormat = GL_RGBA_INTEGER;
                         break;
                     case GL_RGB32I:
-                        if (outFormat) *outFormat = GL_RGB;
+                        if (outFormat) *outFormat = GL_RGB_INTEGER;
                         break;
                     case GL_RG32I:
-                        if (outFormat) *outFormat = GL_RG;
+                        if (outFormat) *outFormat = GL_RG_INTEGER;
                         break;
                     case GL_R32I:
-                        if (outFormat) *outFormat = GL_RED;
+                        if (outFormat) *outFormat = GL_RED_INTEGER;
                         break;
                     }
                 break;
@@ -213,12 +212,6 @@ namespace MobileGL::MG_Backend::DirectGLES {
                 }
                 break;
 
-            case GL_R16:
-                if (outInternalFormat) *outInternalFormat = GL_R16F;
-                if (outType) *outType = GL_FLOAT;
-                if (outFormat) *outFormat = GL_RED;
-                break;
-
             case GL_RGB16:
                 if (outInternalFormat) *outInternalFormat = GL_RGB16F;
                 if (outType) *outType = GL_HALF_FLOAT;
@@ -232,7 +225,6 @@ namespace MobileGL::MG_Backend::DirectGLES {
                 break;
 
             case GL_RG16:
-            case GL_RG16F:
                 if (outInternalFormat) *outInternalFormat = GL_RG16F;
                 if (outType) *outType = GL_HALF_FLOAT;
                 if (outFormat) *outFormat = GL_RG;
@@ -243,12 +235,87 @@ namespace MobileGL::MG_Backend::DirectGLES {
                 if (outType) *outType = GL_UNSIGNED_BYTE;
                 if (outFormat) *outFormat = GL_RED;
                 break;
+
+            case GL_R8_SNORM:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_BYTE;
+                if (outFormat) *outFormat = GL_RED;
+                break;
+
+            case GL_RED:
+                // For GL_RED, we need to infer based on type or use default
+                if (outInternalFormat) *outInternalFormat = GL_R8; // Default fallback
+                if (outType) *outType = GL_UNSIGNED_BYTE;          // Default fallback
+                if (outFormat) *outFormat = GL_RED;
+                break;
+
             case GL_R8UI:
                 if (outInternalFormat) *outInternalFormat = internalFormat;
                 if (outType) *outType = GL_UNSIGNED_BYTE;
                 if (outFormat) *outFormat = GL_RED_INTEGER;
                 break;
 
+            case GL_R8I:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_BYTE;
+                if (outFormat) *outFormat = GL_RED_INTEGER;
+                break;
+
+            case GL_R16UI:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_UNSIGNED_SHORT;
+                if (outFormat) *outFormat = GL_RED_INTEGER;
+                break;
+
+            case GL_R16I:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_SHORT;
+                if (outFormat) *outFormat = GL_RED_INTEGER;
+                break;
+
+            case GL_RG8:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_UNSIGNED_BYTE;
+                if (outFormat) *outFormat = GL_RG;
+                break;
+
+            case GL_RG8_SNORM:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_BYTE;
+                if (outFormat) *outFormat = GL_RG;
+                break;
+
+            case GL_RG16F:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_HALF_FLOAT;
+                if (outFormat) *outFormat = GL_RG;
+                break;
+
+            case GL_RG8UI:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_UNSIGNED_BYTE;
+                if (outFormat) *outFormat = GL_RG_INTEGER;
+                break;
+
+            case GL_RG8I:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_BYTE;
+                if (outFormat) *outFormat = GL_RG_INTEGER;
+                break;
+
+            case GL_RG16UI:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_UNSIGNED_SHORT;
+                if (outFormat) *outFormat = GL_RG_INTEGER;
+                break;
+
+            case GL_RG16I:
+                if (outInternalFormat) *outInternalFormat = internalFormat;
+                if (outType) *outType = GL_SHORT;
+                if (outFormat) *outFormat = GL_RG_INTEGER;
+                break;
+
+
             case GL_RGB8_SNORM:
             case GL_RGBA8_SNORM:
                 if (outInternalFormat) *outInternalFormat = internalFormat;
@@ -261,20 +328,37 @@ namespace MobileGL::MG_Backend::DirectGLES {
                     }
                 }
                 break;
+
             case GL_RGB8:
                 if (outInternalFormat) *outInternalFormat = internalFormat;
                 if (outType) *outType = GL_UNSIGNED_BYTE;
                 if (outFormat) *outFormat = GL_RGB;
                 break;
+
             case GL_RGBA16_SNORM:
                 if (outInternalFormat) *outInternalFormat = internalFormat;
                 if (outType) *outType = GL_SHORT;
                 if (outFormat) *outFormat = GL_RGBA;
                 break;
+
             default:
+                // Fallback handling for other formats
                 if (outInternalFormat) *outInternalFormat = internalFormat;
-                if (outType) *outType = GL_UNSIGNED_INT;
-                if (outFormat) *outFormat = GL_RGBA;
+                if (outType) *outType = GL_UNSIGNED_BYTE; // More reasonable default
+                if (outFormat) {
+                    // Try to infer format from internal format name
+                    if (strstr(MG_Util::ConvertGLEnumToString(internalFormat).c_str(), "RGBA") != nullptr) {
+                        *outFormat = GL_RGBA;
+                    } else if (strstr(MG_Util::ConvertGLEnumToString(internalFormat).c_str(), "RGB") != nullptr) {
+                        *outFormat = GL_RGB;
+                    } else if (strstr(MG_Util::ConvertGLEnumToString(internalFormat).c_str(), "RG") != nullptr) {
+                        *outFormat = GL_RG;
+                    } else if (strstr(MG_Util::ConvertGLEnumToString(internalFormat).c_str(), "RED") != nullptr) {
+                        *outFormat = GL_RED;
+                    } else {
+                        *outFormat = GL_RGBA; // Ultimate fallback
+                    }
+                }
                 break;
             }
         }
diff --git a/MobileGL/MG_State/GLState/TextureState/TextureObject1D.cpp b/MobileGL/MG_State/GLState/TextureState/TextureObject1D.cpp
index eae3556b..d1ef8a6a 100644
--- a/MobileGL/MG_State/GLState/TextureState/TextureObject1D.cpp
+++ b/MobileGL/MG_State/GLState/TextureState/TextureObject1D.cpp
@@ -4,7 +4,7 @@ namespace MobileGL {
     namespace MG_State {
         namespace GLState {
             TextureObject1D::TextureObject1D(Uint externalIndex)
-                            : TextureObjectWithOneMipmap(TextureTarget::Texture1D, externalIndex) {}
+                : TextureObjectWithOneMipmap(TextureTarget::Texture1D, externalIndex) {}
 
             Uint TextureObject1D::GetIndexOfTextureUploadTarget(TextureUploadTarget target) const {
                 MOBILEGL_ASSERT(target == TextureUploadTarget::Texture1D ||
diff --git a/MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp b/MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp
index e1b7fd10..1d10506c 100644
--- a/MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp
+++ b/MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp
@@ -3,10 +3,8 @@
 namespace MobileGL {
     namespace MG_State {
         namespace GLState {
-            TextureObject2DCube::TextureObject2DCube(Uint externalIndex):
-                TextureObjectBase(TextureTarget::TextureCubeMap, externalIndex) {
-
-            }
+            TextureObject2DCube::TextureObject2DCube(Uint externalIndex)
+                : TextureObjectBase(TextureTarget::TextureCubeMap, externalIndex) {}
 
             Uint TextureObject2DCube::GetMipmapLevelCount() const {
                 return m_textureStorage.GetLevelCount();
diff --git a/MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp b/MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp
index f32f2557..e472edc0 100644
--- a/MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp
+++ b/MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp
@@ -4,7 +4,7 @@ namespace MobileGL {
     namespace MG_State {
         namespace GLState {
             TextureObject3D::TextureObject3D(Uint externalIndex)
-                            : TextureObjectWithOneMipmap(TextureTarget::Texture3D, externalIndex) {}
+                : TextureObjectWithOneMipmap(TextureTarget::Texture3D, externalIndex) {}
 
             Uint TextureObject3D::GetIndexOfTextureUploadTarget(TextureUploadTarget target) const {
                 MOBILEGL_ASSERT(target == TextureUploadTarget::Texture3D ||
diff --git a/MobileGL/MG_State/GLState/TextureState/TextureStorage.h b/MobileGL/MG_State/GLState/TextureState/TextureStorage.h
index eb9ab302..f140c2b8 100644
--- a/MobileGL/MG_State/GLState/TextureState/TextureStorage.h
+++ b/MobileGL/MG_State/GLState/TextureState/TextureStorage.h
@@ -14,9 +14,7 @@ namespace MobileGL {
             template <SizeT TargetCount>
             class TextureStorage {
             public:
-                TextureStorage() {
-                    static_assert(TargetCount > 0, "Mipmap size must be greater than zero");
-                }
+                TextureStorage() { static_assert(TargetCount > 0, "Mipmap size must be greater than zero"); }
 
                 void AllocateLevel(Uint targetIndex, Uint level, MipmapInput input) {
                     MOBILEGL_ASSERT(targetIndex < TargetCount, "AllocateLevel: target invalid");
@@ -61,8 +59,7 @@ namespace MobileGL {
                     MOBILEGL_ASSERT(targetIndex < TargetCount, "GetTexelSize: target invalid");
 
                     auto& targetTexelSizes = m_texelSizes[targetIndex];
-                    if (level >= targetTexelSizes.size())
-                        return {0, 0, 0};
+                    if (level >= targetTexelSizes.size()) return {0, 0, 0};
                     return targetTexelSizes[level];
                 }
 
@@ -73,9 +70,7 @@ namespace MobileGL {
                     return data[level].size();
                 }
 
-                SizeT GetLevelCount() const {
-                    return m_data[0].size();
-                }
+                SizeT GetLevelCount() const { return m_data[0].size(); }
 
                 void MarkDirty(Uint targetIndex, Uint level, bool dirty) {
                     MOBILEGL_ASSERT(targetIndex < TargetCount, "MarkDirty: target invalid");
@@ -94,6 +89,6 @@ namespace MobileGL {
                 Array<Vector<Vector<Uint8>>, TargetCount> m_data;
                 Array<Vector<bool>, TargetCount> m_isDirty;
             };
-        }
-    }
-}
+        } // namespace GLState
+    } // namespace MG_State
+} // namespace MobileGL