TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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); stride, client_pointer);
} }
if (divisor > 0) { _glgsg->set_vertex_attrib_divisor(p, divisor);
_glgsg->set_vertex_attrib_divisor(p, divisor); }
} else {
} else {
// It's a conventional vertex attribute. Ugh. // It's a conventional vertex attribute. Ugh.
#ifdef SUPPORT_FIXED_FUNCTION #ifdef SUPPORT_FIXED_FUNCTION
switch (p) { 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); stride, client_pointer);
} }
if (divisor > 0) { _glgsg->set_vertex_attrib_divisor(p, divisor);
_glgsg->set_vertex_attrib_divisor(p, divisor);
}
++p; ++p;
client_pointer += element_stride; client_pointer += element_stride;