Added code to handle the new dynamic VertAttribs in OpenGL.

Not so sure about getting active program and searching for
the bound pipeline in the pipeline store, but not set in any
particular solution either for the moment.

Author: Kwizatz

cmake/c_cpp_properties.json.in

@@ -12,7 +12,6 @@
                 "@CMAKE_SOURCE_DIR@/tools/worldeditor",
                 "@CMAKE_BINARY_DIR@/tools/worldeditor",
                 "@CMAKE_BINARY_DIR@/engine/renderers/opengl",
-                "@CMAKE_BINARY_DIR@/engine/renderers/vulkan",
                 "@CMAKE_BINARY_DIR@/engine",
                 "@CMAKE_BINARY_DIR@/proto/"
             ],

engine/renderers/opengl/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019,2021 Rodrigo Jose Hernandez Cordoba
+# Copyright (C) 2016-2019,2021,2025 Rodrigo Jose Hernandez Cordoba
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
@@ -17,7 +17,7 @@ if(UNIX)
   find_package(X11)
 endif()
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include)
 
 set(CMAKE_REQUIRED_QUIET OFF)
 
@@ -151,11 +151,7 @@ set(OPENGL_RENDERER_HEADERS
     ${CMAKE_CURRENT_BINARY_DIR}/glAssignments.h
     ${CMAKE_CURRENT_BINARY_DIR}/glProxyFunctions.h
     OpenGLRenderer.h
-    #OpenGLWinAPIRenderer.h
-    #OpenGLX11Renderer.h
     OpenGLWindow.h
-    #OpenGLWinAPIWindow.h
-    #OpenGLX11Window.h
     OpenGLFunctions.h
     OpenGLBuffer.h
     OpenGLMesh.h
@@ -168,11 +164,7 @@ set(OPENGL_RENDERER_HEADERS
 set(OPENGL_RENDERER_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/glProxyFunctions.cpp
     OpenGLRenderer.cpp
-    #OpenGLWinAPIRenderer.cpp
-    #OpenGLX11Renderer.cpp
     OpenGLWindow.cpp
-    #OpenGLWinAPIWindow.cpp
-    #OpenGLX11Window.cpp
     OpenGLBuffer.cpp
     OpenGLMesh.cpp
     OpenGLPipeline.cpp

engine/renderers/opengl/OpenGLMesh.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2016-2019,2021 Rodrigo Jose Hernandez Cordoba
+Copyright (C) 2016-2019,2021,2025 Rodrigo Jose Hernandez Cordoba
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@ limitations under the License.
 
 #include <cassert>
 #include <unordered_map>
+#include <algorithm>
 #include "OpenGLFunctions.h"
 #include "aeongames/Mesh.h"
 #include "OpenGLMesh.h"
@@ -62,20 +63,37 @@ namespace AeonGames
     {
         glBindBuffer ( GL_ARRAY_BUFFER, mVertexBuffer.GetBufferId() );
         OPENGL_CHECK_ERROR_THROW;
-        /** @todo Find out what is best disable all or only unused */
-        for ( GLuint i = 0; i < Mesh::SEMANTIC_COUNT; ++i )
+    }
+
+    void OpenGLMesh::EnableAttributes ( const std::vector<OpenGLVertexAttribute>& aAttributes ) const
+    {
+        for ( GLuint i = 0; i < 8; ++i )
         {
             glDisableVertexAttribArray ( i );
         }
+
         size_t offset{0};
         for ( auto& attribute : mMesh->GetAttributes() )
         {
-            glEnableVertexAttribArray ( std::get<0> ( attribute ) );
+            auto it = std::lower_bound ( aAttributes.begin(), aAttributes.end(), std::get<0> ( attribute ),
+                                         [] ( const OpenGLVertexAttribute & a, uint32_t b )
+            {
+                return a.name < b;
+            } );
+            if ( it == aAttributes.end() || it->name != std::get<0> ( attribute ) )
+            {
+                /* If we get here, it means the attribute is not present in aAttributes,
+                    but it is present in the mesh, so skip it and continue. */
+                offset += GetAttributeTotalSize ( attribute );
+                continue;
+            }
+
+            glEnableVertexAttribArray ( it->location );
             OPENGL_CHECK_ERROR_THROW;
             if ( ! ( std::get<3> ( attribute ) & Mesh::AttributeFlag::INTEGER ) )
             {
                 glVertexAttribPointer (
-                    std::get<0> ( attribute ),
+                    it->location,
                     std::get<1> ( attribute ),
                     MeshTypeToOGL[std::get<2> ( attribute )],
                     std::get<3> ( attribute ) & Mesh::AttributeFlag::NORMALIZED,
@@ -86,7 +104,7 @@ namespace AeonGames
             else
             {
                 glVertexAttribIPointer (
-                    std::get<0> ( attribute ),
+                    it->location,
                     std::get<1> ( attribute ),
                     MeshTypeToOGL[std::get<2> ( attribute )],
                     static_cast<GLsizei> ( mMesh->GetStride() ),
@@ -105,4 +123,12 @@ namespace AeonGames
         }
         OPENGL_CHECK_ERROR_THROW;
     }
+
+    void OpenGLMesh::DisableAttributes ( const std::vector<OpenGLVertexAttribute>& aAttributes ) const
+    {
+        for ( const auto& attribute : aAttributes )
+        {
+            glDisableVertexAttribArray ( attribute.location );
+        }
+    }
 }

engine/renderers/opengl/OpenGLMesh.h

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2016-2019,2021 Rodrigo Jose Hernandez Cordoba
+Copyright (C) 2016-2019,2021,2025 Rodrigo Jose Hernandez Cordoba
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@ limitations under the License.
 #ifndef AEONGAMES_OPENGLMESH_H
 #define AEONGAMES_OPENGLMESH_H
 
+#include <vector>
 #include "OpenGLBuffer.h"
-
+#include "OpenGLVertexAttribute.h"
 namespace AeonGames
 {
     class Mesh;
@@ -32,6 +33,8 @@ namespace AeonGames
         OpenGLMesh& operator= ( const OpenGLMesh& aOpenGLMesh ) = delete;
         OpenGLMesh& operator= ( OpenGLMesh&& aOpenGLMesh ) = delete;
         void Bind() const;
+        void EnableAttributes ( const std::vector<OpenGLVertexAttribute>& aAttributes ) const;
+        void DisableAttributes ( const std::vector<OpenGLVertexAttribute>& aAttributes ) const;
     private:
         const OpenGLRenderer& mOpenGLRenderer;
         const Mesh* mMesh{nullptr};

engine/renderers/opengl/OpenGLPipeline.cpp

@@ -13,11 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-#include "aeongames/Pipeline.h"
-#include "aeongames/CRC.h"
 #include "OpenGLPipeline.h"
 #include "OpenGLFunctions.h"
+#include "aeongames/CRC.h"
 #include <vector>
+#include <algorithm>
 
 namespace AeonGames
 {
@@ -27,6 +27,7 @@ namespace AeonGames
     {
         std::swap ( mPipeline, aOpenGLPipeline.mPipeline );
         std::swap ( mProgramId, aOpenGLPipeline.mProgramId );
+        mAttributes.swap ( aOpenGLPipeline.mAttributes );
     }
 #if 0
     static std::string GetVertexShaderCode ( const Pipeline& aPipeline )
@@ -238,7 +239,7 @@ namespace AeonGames
         GLint num_active_attributes;
         glGetProgramiv ( mProgramId, GL_ACTIVE_ATTRIBUTES, &num_active_attributes );
         OPENGL_CHECK_ERROR_THROW;
-
+        mAttributes.reserve ( num_active_attributes );
         for ( GLint i = 0; i < num_active_attributes; ++i )
         {
             GLchar name[256];
@@ -249,13 +250,13 @@ namespace AeonGames
             OPENGL_CHECK_ERROR_THROW;
             GLint location = glGetAttribLocation ( mProgramId, name );
             OPENGL_CHECK_ERROR_THROW;
-            if ( location >= 0 )
-            {
-                mAttributes.push_back ( Attribute{ crc32i ( name, length ), static_cast<uint32_t> ( location ), static_cast<uint32_t> ( size ), static_cast<uint32_t> ( type ) } );
-            }
-            std::cout << "Attribute " << i << ": " << name << " (location: " << location << ", size: " << size << ", type: " << type << ")" << std::endl;
+            mAttributes.push_back ( { crc32i ( name, length ), location, size, type } );
+            std::cout << "Attribute " << i << ": " << name << " (crc: " << std::hex << mAttributes.back().name << std::dec << " location: " << location << ", size: " << size << ", type: " << type << ")" << std::endl;
         }
-
+        std::sort ( mAttributes.begin(), mAttributes.end(), [] ( const OpenGLVertexAttribute & a, const OpenGLVertexAttribute & b )
+        {
+            return a.name < b.name;
+        } );
 
         GLint num_active_uniforms;
         glGetProgramiv ( mProgramId, GL_ACTIVE_UNIFORMS, &num_active_uniforms );
@@ -346,8 +347,13 @@ namespace AeonGames
         OPENGL_CHECK_ERROR_NO_THROW;
     }
 
-    uint32_t OpenGLPipeline::GetProgramId() const
+    GLint OpenGLPipeline::GetProgramId() const
     {
         return mProgramId;
     }
+
+    const std::vector<OpenGLVertexAttribute>& OpenGLPipeline::GetVertexAttributes() const
+    {
+        return mAttributes;
+    }
 }

engine/renderers/opengl/OpenGLPipeline.h

@@ -18,6 +18,7 @@ limitations under the License.
 #include <cstdint>
 #include <vector>
 #include <string_view>
+#include "OpenGLVertexAttribute.h"
 #include "aeongames/Pipeline.h"
 
 namespace AeonGames
@@ -33,27 +34,19 @@ namespace AeonGames
     class OpenGLPipeline
     {
     public:
-        struct Attribute
-        {
-            uint32_t name;
-            uint32_t location;
-            uint32_t size;
-            uint32_t type;
-        };
         OpenGLPipeline ( const OpenGLRenderer& aOpenGLRenderer, const Pipeline& aPipeline );
         OpenGLPipeline ( OpenGLPipeline&& aOpenGLPipeline );
         OpenGLPipeline ( const OpenGLPipeline& ) = delete;
         OpenGLPipeline& operator= ( const OpenGLPipeline& ) = delete;
         OpenGLPipeline& operator= ( OpenGLPipeline&& ) = delete;
         ~OpenGLPipeline();
-        uint32_t GetProgramId() const;
-        const Attribute& GetAttribute ( uint32_t name ) const;
-        const Attribute& GetAttribute ( std::string_view name ) const;
+        GLint GetProgramId() const;
+        const std::vector<OpenGLVertexAttribute>& GetVertexAttributes () const;
     private:
         const OpenGLRenderer& mOpenGLRenderer;
         const Pipeline* mPipeline{};
-        uint32_t mProgramId{};
-        std::vector<Attribute> mAttributes{};
+        GLint mProgramId{};
+        std::vector<OpenGLVertexAttribute> mAttributes{};
     };
 }
 #endif

engine/renderers/opengl/OpenGLRenderer.cpp

@@ -512,6 +512,16 @@ void main()
             it = mMeshStore.find(aMesh.GetConsecutiveId());
         }
         it->second.Bind();
+        GLint currentProgram{0};
+        glGetIntegerv(GL_CURRENT_PROGRAM, &currentProgram);
+        auto pipeline = std::find_if(mPipelineStore.begin(), mPipelineStore.end(),
+        [currentProgram](const auto& pair) {
+            return pair.second.GetProgramId() == currentProgram;
+        });
+        if (pipeline != mPipelineStore.end())
+        {
+            it->second.EnableAttributes(pipeline->second.GetVertexAttributes());
+        }
     }
 
     void OpenGLRenderer::LoadPipeline(const Pipeline& aPipeline)

include/aeongames/Mesh.h

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2016-2021 Rodrigo Jose Hernandez Cordoba
+Copyright (C) 2016-2021,2025 Rodrigo Jose Hernandez Cordoba
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 #include "aeongames/AABB.h"
+#include "aeongames/CRC.h"
 #include "aeongames/Resource.h"
 
 namespace AeonGames
@@ -28,17 +29,16 @@ namespace AeonGames
     class Mesh final : public Resource
     {
     public:
-        enum AttributeSemantic : uint8_t
+        enum AttributeSemantic : uint32_t
         {
-            POSITION                      = 0,
-            NORMAL                        = 1,
-            TANGENT                       = 2,
-            BITANGENT                     = 3,
-            TEXCOORD                      = 4,
-            WEIGHT_INDEX                  = 5,
-            WEIGHT_VALUE                  = 6,
-            COLOR                         = 7,
-            SEMANTIC_COUNT
+            POSITION                      = "VertexPosition"_crc32,
+            NORMAL                        = "VertexNormal"_crc32,
+            TANGENT                       = "VertexTangent"_crc32,
+            BITANGENT                     = "VertexBitangent"_crc32,
+            TEXCOORD                      = "VertexUV"_crc32,
+            WEIGHT_INDEX                  = "VertexWeightIndices"_crc32,
+            WEIGHT_VALUE                  = "VertexWeights"_crc32,
+            COLOR                         = "VertexColor"_crc32,
         };
 
         enum AttributeType : uint8_t

proto/mesh.proto

@@ -1,4 +1,4 @@
-// Copyright (C) 2016,2018,2019,2021 Rodrigo Jose Hernandez Cordoba
+// Copyright (C) 2016,2018,2019,2021,2025 Rodrigo Jose Hernandez Cordoba
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,14 +21,15 @@ message AttributeMsg
 {
     enum AttributeSemantic
     {
-        POSITION            = 0;
-        NORMAL              = 1;
-        TANGENT             = 2;
-        BITANGENT           = 3;
-        TEXCOORD            = 4;
-        WEIGHT_INDEX        = 5;
-        WEIGHT_VALUE        = 6;
-        COLOR               = 7;
+        UNUSED              = 0x0;
+        POSITION            = 0x3DE95988;
+        NORMAL              = 0x06843867;
+        TANGENT             = 0x508CD822;
+        BITANGENT           = -863954250; //0xCC811AB6;
+        TEXCOORD            = 0x7683CFA6;
+        WEIGHT_INDEX        = 0x48129712;
+        WEIGHT_VALUE        = 0x6E44A092;
+        COLOR               = 0x65476198;
     }
     enum AttributeType
     {