RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

glgsg: Fix failure to unset divisor after rendering w/ instancing 

This would normally be done by `disable_shader_vertex_arrays()` but it apparently isn't called between shader changes
This commit is contained in:
rdb 2022-11-14 10:25:09 +01:00
parent 75cbe98b1d
commit e92d993cea
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/glstuff/glCgShaderContext_src.cxx
View File

@ -905,11 +905,9 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
stride, client_pointer);
}
if (divisor > 0) {
_glgsg->set_vertex_attrib_divisor(p, divisor);
}
} else {
_glgsg->set_vertex_attrib_divisor(p, divisor);
}
else {
// It's a conventional vertex attribute. Ugh.
#ifdef SUPPORT_FIXED_FUNCTION
switch (p) {

4
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -2568,9 +2568,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
stride, client_pointer);
}
if (divisor > 0) {
_glgsg->set_vertex_attrib_divisor(p, divisor);
}
_glgsg->set_vertex_attrib_divisor(p, divisor);
++p;
client_pointer += element_stride;