Complements the #4348 GPU skinning fix

raysan5 · Sep 30, 2024 · 3848525 · 3848525
1 parent 0e7bcd5
commit 3848525
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/rlgl.h b/src/rlgl.h
@@ -345,14 +345,17 @@
  #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2 5
 #endif
 #ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES
-#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES   6
+  #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES 6
 #endif
+
+#ifdef RL_SUPPORT_MESH_ANIMATION_VBO
 #ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS
  #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS 7
 #endif
 #ifndef RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS
  #define RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS 8
 #endif
+#endif
 
 
 //----------------------------------------------------------------------------------

diff --git a/src/rmodels.c b/src/rmodels.c
@@ -1253,8 +1253,11 @@ void UploadMesh(Mesh *mesh, bool dynamic)
  mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT] = 0; // Vertex buffer: tangents
  mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2] = 0; // Vertex buffer: texcoords2
  mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES] = 0; // Vertex buffer: indices
+
+#ifdef RL_SUPPORT_MESH_ANIMATION_VBO
  mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS] = 0; // Vertex buffer: boneIds
  mesh->vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS] = 0; // Vertex buffer: boneWeights
+#endif
 
 
 #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
@@ -1819,7 +1822,8 @@ void DrawMeshInstanced(Mesh mesh, Material material, const Matrix *transforms, i
  rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD02], 2, RL_FLOAT, 0, 0, 0);
  rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD02]);
  }
-
+
+#ifdef RL_SUPPORT_MESH_ANIMATION_VBO
  // Bind mesh VBO data: vertex bone ids (shader-location = 6, if available)
  if (material.shader.locs[SHADER_LOC_VERTEX_BONEIDS] != -1)
  {
@@ -1835,6 +1839,7 @@ void DrawMeshInstanced(Mesh mesh, Material material, const Matrix *transforms, i
  rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_BONEWEIGHTS], 4, RL_FLOAT, 0, 0, 0);
  rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_BONEWEIGHTS]);
  }
+#endif
 
  if (mesh.indices != NULL) rlEnableVertexBufferElement(mesh.vboId[RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES]);
  }