TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Proper unbinding of GLSL matrix attribute arrays

Browse Source
This commit is contained in:
rdb 2015-02-05 13:27:35 +01:00
parent 7c14d1872a
commit 3bf2a0f814
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,6 +734,7 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
bind._id = arg_id; bind._id = arg_id;
bind._name = NULL; bind._name = NULL;
bind._append_uv = -1; bind._append_uv = -1;
bind._elements = 1;
if (param_name.substr(0, 3) == "gl_") { if (param_name.substr(0, 3) == "gl_") {
// Not all drivers return -1 in glGetAttribLocation // Not all drivers return -1 in glGetAttribLocation
@ -792,6 +793,24 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
GLCAT.error() << "Unrecognized vertex attrib '" << param_name << "'!\n"; GLCAT.error() << "Unrecognized vertex attrib '" << param_name << "'!\n";
continue; continue;
} }
// Get the number of bind points.
switch (param_type) {
case GL_FLOAT_MAT3:
case GL_DOUBLE_MAT3:
bind._elements = 3 * param_size;
break;
case GL_FLOAT_MAT4:
case GL_DOUBLE_MAT4:
bind._elements = 4 * param_size;
break;
default:
bind._elements = param_size;
break;
}
s->_var_spec.push_back(bind); s->_var_spec.push_back(bind);
} }
} }
@ -1001,7 +1020,9 @@ disable_shader_vertex_arrays() {
if (_glgsg->_supports_vertex_attrib_divisor) { if (_glgsg->_supports_vertex_attrib_divisor) {
_glgsg->_glVertexAttribDivisor(p, 0); _glgsg->_glVertexAttribDivisor(p, 0);
} }
_glgsg->_glDisableVertexAttribArray(p); for (int i = 0; i < bind._elements; ++i) {
_glgsg->_glDisableVertexAttribArray(p + i);
}
} }
_glgsg->report_my_gl_errors(); _glgsg->report_my_gl_errors();
@ -1091,7 +1112,9 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
client_pointer += element_stride; client_pointer += element_stride;
} }
} else { } else {
_glgsg->_glDisableVertexAttribArray(p); for (int i = 0; i < bind._elements; ++i) {
_glgsg->_glDisableVertexAttribArray(p + i);
}
} }
} }
} }

1
panda/src/gobj/shader.h
View File

@ -359,6 +359,7 @@ public:
ShaderArgId _id; ShaderArgId _id;
PT(InternalName) _name; PT(InternalName) _name;
int _append_uv; int _append_uv;
int _elements;
bool _integer; bool _integer;
}; };