mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 02:24:07 +02:00
Code Issues Releases Wiki Activity

#23 fix VAO

Browse Source
This commit is contained in:
XProger
2018-03-03 14:35:14 +03:00
parent 9388002bf4
commit 793ea5ff34
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesh.h
View File

@@ -68,10 +68,10 @@ struct MeshRange {
struct Mesh { struct Mesh {
Index *iBuffer; Index *iBuffer;
VertexGPU *vBuffer; VertexGPU *vBuffer;
#ifndef _PSP #ifndef _PSP
GLuint ID[2]; GLuint ID[2];
GLuint *VAO; GLuint *VAO;
#endif #endif
int iCount; int iCount;
int vCount; int vCount;
@@ -191,7 +191,7 @@ struct Mesh {
void initRange(MeshRange &range) { void initRange(MeshRange &range) {
#ifndef _PSP #ifndef _PSP
if (Core::support.VAO) { if (Core::support.VAO && VAO) {
ASSERT(aIndex < aCount); ASSERT(aIndex < aCount);
range.aIndex = aIndex++; range.aIndex = aIndex++;
range.bind(VAO); range.bind(VAO);
@@ -219,10 +219,9 @@ struct Mesh {
range.bind(VAO); range.bind(VAO);
#endif #endif
if (range.aIndex == -1) { bind();
bind(); if (range.aIndex == -1)
range.setup(vBuffer); range.setup(vBuffer);
};
Core::DIP(range.iStart, range.iCount, iBuffer); Core::DIP(range.iStart, range.iCount, iBuffer);
} }