ecker/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only recalc the fast path when pointers change

Browse Source
This commit is contained in:
Luke Benstead 2021-09-13 10:40:25 +01:00
parent 66d09e7d77
commit 52ff506397
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
GL/draw.c
View File

@ -1284,7 +1284,6 @@ void APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvo
if(_glCheckImmediateModeInactive(__func__)) { if(_glCheckImmediateModeInactive(__func__)) {
return; return;
} }
_glRecalcFastPath();
submitVertices(mode, 0, count, type, indices); submitVertices(mode, 0, count, type, indices);
} }
@ -1295,7 +1294,6 @@ void APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count) {
if(_glCheckImmediateModeInactive(__func__)) { if(_glCheckImmediateModeInactive(__func__)) {
return; return;
} }
_glRecalcFastPath();
submitVertices(mode, first, count, GL_UNSIGNED_INT, NULL); submitVertices(mode, first, count, GL_UNSIGNED_INT, NULL);
} }
@ -1361,6 +1359,10 @@ void APIENTRY glClientActiveTextureARB(GLenum texture) {
ACTIVE_CLIENT_TEXTURE = (texture == GL_TEXTURE1_ARB) ? 1 : 0; ACTIVE_CLIENT_TEXTURE = (texture == GL_TEXTURE1_ARB) ? 1 : 0;
} }
GL_FORCE_INLINE GLboolean _glComparePointers(AttribPointer* p, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) {
return (p->size == size && p->type == type && p->stride == stride && p->ptr == pointer);
}
void APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { void APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) {
TRACE(); TRACE();
@ -1371,10 +1373,17 @@ void APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, cons
AttribPointer* tointer = (ACTIVE_CLIENT_TEXTURE == 0) ? &ATTRIB_POINTERS.uv : &ATTRIB_POINTERS.st; AttribPointer* tointer = (ACTIVE_CLIENT_TEXTURE == 0) ? &ATTRIB_POINTERS.uv : &ATTRIB_POINTERS.st;
if(_glComparePointers(tointer, size, type, stride, pointer)) {
// No Change
return;
}
tointer->ptr = pointer; tointer->ptr = pointer;
tointer->stride = (stride) ? stride : size * byte_size(type); tointer->stride = (stride) ? stride : size * byte_size(type);
tointer->type = type; tointer->type = type;
tointer->size = size; tointer->size = size;
_glRecalcFastPath();
} }
void APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { void APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) {
@ -1385,10 +1394,17 @@ void APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const G
return; return;
} }
if(_glComparePointers(&ATTRIB_POINTERS.vertex, size, type, stride, pointer)) {
// No Change
return;
}
ATTRIB_POINTERS.vertex.ptr = pointer; ATTRIB_POINTERS.vertex.ptr = pointer;
ATTRIB_POINTERS.vertex.stride = (stride) ? stride : (size * byte_size(ATTRIB_POINTERS.vertex.type)); ATTRIB_POINTERS.vertex.stride = (stride) ? stride : (size * byte_size(ATTRIB_POINTERS.vertex.type));
ATTRIB_POINTERS.vertex.type = type; ATTRIB_POINTERS.vertex.type = type;
ATTRIB_POINTERS.vertex.size = size; ATTRIB_POINTERS.vertex.size = size;
_glRecalcFastPath();
} }
void APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { void APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) {
@ -1399,10 +1415,17 @@ void APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const G
return; return;
} }
if(_glComparePointers(&ATTRIB_POINTERS.colour, size, type, stride, pointer)) {
// No Change
return;
}
ATTRIB_POINTERS.colour.ptr = pointer; ATTRIB_POINTERS.colour.ptr = pointer;
ATTRIB_POINTERS.colour.type = type; ATTRIB_POINTERS.colour.type = type;
ATTRIB_POINTERS.colour.size = (ATTRIB_POINTERS.colour.size == GL_BGRA) ? 4 : size; ATTRIB_POINTERS.colour.size = (ATTRIB_POINTERS.colour.size == GL_BGRA) ? 4 : size;
ATTRIB_POINTERS.colour.stride = (stride) ? stride : ATTRIB_POINTERS.colour.size * byte_size(type); ATTRIB_POINTERS.colour.stride = (stride) ? stride : ATTRIB_POINTERS.colour.size * byte_size(type);
_glRecalcFastPath();
} }
void APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) { void APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) {
@ -1423,8 +1446,15 @@ void APIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid * poin
return; return;
} }
if(_glComparePointers(&ATTRIB_POINTERS.normal, 3, type, stride, pointer)) {
// No Change
return;
}
ATTRIB_POINTERS.normal.ptr = pointer; ATTRIB_POINTERS.normal.ptr = pointer;
ATTRIB_POINTERS.normal.size = (type == GL_UNSIGNED_INT_2_10_10_10_REV) ? 1 : 3; ATTRIB_POINTERS.normal.size = (type == GL_UNSIGNED_INT_2_10_10_10_REV) ? 1 : 3;
ATTRIB_POINTERS.normal.stride = (stride) ? stride : ATTRIB_POINTERS.normal.size * byte_size(type); ATTRIB_POINTERS.normal.stride = (stride) ? stride : ATTRIB_POINTERS.normal.size * byte_size(type);
ATTRIB_POINTERS.normal.type = type; ATTRIB_POINTERS.normal.type = type;
_glRecalcFastPath();
} }