TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow arbitrarily named vertex attribs in OpenGL

Browse Source
This commit is contained in:
rdb 2011-11-28 19:21:47 +00:00
parent 8609b6e6b1
commit 14d7c7093a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,13 +354,14 @@ CLP(ShaderContext)(Shader *s, GSG *gsg) : ShaderContext(s) {
for (int i = 0; i < param_count; ++i) { for (int i = 0; i < param_count; ++i) {
gsg->_glGetActiveAttrib(_glsl_program, i, param_maxlength, NULL, &param_size, &param_type, param_name); gsg->_glGetActiveAttrib(_glsl_program, i, param_maxlength, NULL, &param_size, &param_type, param_name);
PT(InternalName) inputname = InternalName::make(param_name); PT(InternalName) inputname = InternalName::make(param_name);
if (inputname->get_name().substr(0, 4) == "p3d_") {
if (inputname->get_name().substr(0, 4) == "gl_") {
// We shouldn't bind anything to these.
} else if (inputname->get_name().substr(0, 4) == "p3d_") {
noprefix = inputname->get_name().substr(4); noprefix = inputname->get_name().substr(4);
Shader::ShaderVarSpec bind; Shader::ShaderVarSpec bind;
Shader::ShaderArgId arg_id;
arg_id._name = param_name;
arg_id._seqno = -1;
bind._append_uv = -1; bind._append_uv = -1;
if (noprefix == "Vertex") { if (noprefix == "Vertex") {
bind._name = InternalName::get_vertex(); bind._name = InternalName::get_vertex();
s->_var_spec.push_back(bind); s->_var_spec.push_back(bind);
@ -406,6 +407,12 @@ CLP(ShaderContext)(Shader *s, GSG *gsg) : ShaderContext(s) {
} }
GLCAT.error() << "Unrecognized vertex attrib '" << param_name << "'!\n"; GLCAT.error() << "Unrecognized vertex attrib '" << param_name << "'!\n";
continue; continue;
} else {
Shader::ShaderVarSpec bind;
bind._name = inputname;
bind._append_uv = -1;
s->_var_spec.push_back(bind);
gsg->_glBindAttribLocation(_glsl_program, i, param_name);
} }
} }
delete[] param_name; delete[] param_name;