[Feat] (GL_Drawing): Add DrawElementsSHITTILY. Add SPIRV->GLSL ES conversion.

MG/MG_GL/State/Buffer/BufferState.h

@@ -32,11 +32,11 @@ public:
     void Delete(GLuint buffer);
     GLuint GetCurrentBinding(GLenum target) const;
 
-private:
+    std::unordered_map<GLenum, GLuint> currentBindings_;
     std::unordered_map<GLuint, BufferObject> buffers_;
+private:
     std::set<GLuint> freeIds_;
     GLuint lastId_ = 0;
-    std::unordered_map<GLenum, GLuint> currentBindings_;
 
     static bool IsValidTarget_(GLenum target);
 };

MG/MG_GL/State/Common/CommonState.cpp

@@ -107,6 +107,7 @@ GLenum CommonState::Clear(GLbitfield mask) {
     if ((mask & ~validBits) != 0) {
         return GL_INVALID_VALUE;
     }
+    clearMask = mask;
     return GL_NO_ERROR;
 }
 

MG/MG_GL/State/Common/CommonState.h

@@ -9,7 +9,13 @@
 #include "../../../Includes.h"
 
 class CommonState {
-private:
+public:
+    // Viewport
+    GLint viewport[4] = {0, 0, 0, 0};
+    
+    // Color mask
+    GLboolean colorMask[4] = {GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE};
+    
     // Pixel storage parameters
     std::unordered_map<GLenum, GLint> pixelStoreParams;
 
@@ -22,21 +28,15 @@ private:
     // Clear state
     GLfloat clearColor[4] = {0.0f, 0.0f, 0.0f, 0.0f};
     GLfloat clearDepth = 1.0f;
-    
-    // Color mask
-    GLboolean colorMask[4] = {GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE};
-    
+    GLenum clearMask;
+
     // Depth state
     GLenum depthFunc = GL_LESS;
     GLboolean depthMask = GL_TRUE;
-    
-    // Viewport
-    GLint viewport[4] = {0, 0, 0, 0};
-    
+
     // Capability enables
     std::unordered_map<GLenum, bool> capabilities;
     
-public:
     CommonState();
     
     // Return: the validity of the operation, according to OpenGL 3 standard
@@ -57,6 +57,7 @@ public:
     GLenum Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
     
     GLint QueryPixelStoreInt(GLenum pname);
+
 };
 
 #endif //MOBILEGL_COMMONSTATE_H

MG/MG_GL/State/Framebuffer/FramebufferState.cpp

@@ -48,7 +48,6 @@ GLenum FramebufferState::Bind(GLenum target, GLuint framebuffer) {
     if (target == GL_FRAMEBUFFER) {
         currentBindings_[GL_READ_FRAMEBUFFER] = framebuffer;
         currentBindings_[GL_DRAW_FRAMEBUFFER] = framebuffer;
-        currentBindings_[GL_FRAMEBUFFER] = framebuffer;
     } else {
         currentBindings_[target] = framebuffer;
     }
@@ -60,6 +59,7 @@ GLenum FramebufferState::glAttachTexture2D(GLenum target, GLenum attachment,
     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())
         return GL_INVALID_ENUM;
+    if (target == GL_FRAMEBUFFER) target = GL_DRAW_FRAMEBUFFER;
     FramebufferObject* fbo = GetCurrentFBO(target);
     if (!fbo) return GL_INVALID_OPERATION;
     if (texture != 0 && !MG_State_T::textureState->IsTexture(texture))
@@ -84,6 +84,7 @@ GLenum FramebufferState::glAttachTexture2D(GLenum target, GLenum attachment,
 }
 
 GLenum FramebufferState::glValidateCompleteness(GLenum target) {
+    if (target == GL_FRAMEBUFFER) target = GL_DRAW_FRAMEBUFFER;
     FramebufferObject* fbo = GetCurrentFBO(target);
     if (!fbo) return GL_INVALID_OPERATION;
     return fbo->status;

MG/MG_GL/State/Framebuffer/FramebufferState.h

@@ -35,9 +35,10 @@ public:
     GLenum glValidateCompleteness(GLenum target);
     FramebufferObject* GetCurrentFBO(GLenum target);
     
+    std::unordered_map<GLenum, GLuint> currentBindings_; // READ/DRAW/FRAMEBUFFER
+    
 private:
     std::unordered_map<GLuint, FramebufferObject> framebuffers_;
-    std::unordered_map<GLenum, GLuint> currentBindings_; // READ/DRAW/FRAMEBUFFER
     std::set<GLuint> freeIds_;
     GLuint lastId_ = 0;
     bool ValidateHandle(GLuint framebuffer);

MG/MG_GL/State/Program/ProgramState.h

@@ -47,7 +47,7 @@ struct ProgramObject {
 };
 
 class ProgramState {
-private:
+public:
     std::unordered_map<GLuint, ShaderObject> shaders_;
     std::unordered_map<GLuint, ProgramObject> programs_;
     std::set<GLuint> freeShaderIds_;
@@ -56,7 +56,6 @@ private:
     GLuint lastProgramId_ = 0;
     GLuint currentProgram_ = 0;
 
-public:
     ProgramState();
     ~ProgramState();
     

MG/MG_GL/State/Texture/TextureState.h

@@ -55,7 +55,6 @@ public:
 
 class TextureState {
 private:
-    std::vector<TextureUnitState> textureUnits_;
     GLuint activeTextureUnit_ = 0;
 
     GLuint lastUsedID_ = 0;
@@ -88,6 +87,7 @@ public:
     GLenum DeleteN(GLsizei n, const GLuint* textures);
     GLenum QueryLevelPropertyIntVector(GLenum target, GLint level, GLenum pname, GLint* params);
 
+    std::vector<TextureUnitState> textureUnits_;
 private:
     size_t CalculatePixelDataSize_(GLenum format, GLenum type, GLsizei width, GLsizei height);
     void InvalidateTextureInAllUnits_(GLuint texture);

MG/MG_GL/State/VertexArray/VertexArrayState.h

@@ -9,7 +9,7 @@
 #include "../../../Includes.h"
 
 struct VertexAttribState {
-    bool enabled = false;
+    bool enabled;
     GLint size = 4;
     GLenum type = GL_FLOAT;
     GLboolean normalized = GL_FALSE;
@@ -43,11 +43,11 @@ public:
     GLuint GetBoundElementBuffer();
     VertexArrayObject* GetCurrentVAO();
 
-private:
+    GLuint currentVao_ = 0;
     std::unordered_map<GLuint, VertexArrayObject> vaos_;
+private:
     std::set<GLuint> freeIds_;
     GLuint lastId_ = 0;
-    GLuint currentVao_ = 0;
 };
 
 #endif //MOBILEGL_VERTEXARRAYSTATE_H