fixed errors

invor · Jun 29, 2021 · 09f2b87 · 09f2b87
1 parent 1424fa5
commit 09f2b87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/externals/CMakeExternals.cmake b/externals/CMakeExternals.cmake
@@ -71,7 +71,7 @@ function(require_external NAME)
 
     add_external_headeronly_project(glowl
       GIT_REPOSITORY https://github.com/invor/glowl.git
-      GIT_TAG "v0.4f"
+      GIT_TAG "v0.4g"
       INCLUDE_DIR "include")
 
   # json

diff --git a/plugins/mesh/include/mesh/GPUMeshCollection.h b/plugins/mesh/include/mesh/GPUMeshCollection.h
@@ -156,15 +156,15 @@ namespace mesh {
             batched_mesh->vertices_used = 0;
             batched_mesh->indices_used = 0;
 
-            std::vector<GLvoid*> alloc_data(vertex_buffers.size(), nullptr);
+            std::vector<GLvoid const *> alloc_data(vertex_buffers.size(), nullptr);
             std::vector<size_t> alloc_vb_byte_sizes;
             for (size_t attrib_byte_size : vb_attrib_byte_sizes) {
                 alloc_vb_byte_sizes.push_back(attrib_byte_size * new_allocation_vertex_cnt);
             }
 
-            batched_mesh->mesh = std::make_shared<glowl::Mesh>(alloc_data, alloc_vb_byte_sizes, nullptr,
-                new_allocation_index_cnt * glowl::computeByteSize(index_type), vertex_descriptor, index_type, usage,
-                primitive_type);
+            batched_mesh->mesh =
+                std::make_shared<glowl::Mesh>(alloc_data, alloc_vb_byte_sizes, vertex_descriptor, nullptr,
+                new_allocation_index_cnt * glowl::computeByteSize(index_type), index_type, primitive_type, usage);
 
         } else {
             batched_mesh = (*query);