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

Oops, I checked in too much

Browse Source
This commit is contained in:
rdb 2014-07-15 11:16:56 +00:00
parent efa258ebf3
commit 3983c0de05
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,7 +587,6 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
case GL_FLOAT_MAT3: bind._dim[1] = 9; break; case GL_FLOAT_MAT3: bind._dim[1] = 9; break;
case GL_FLOAT_MAT4: bind._dim[1] = 16; break; case GL_FLOAT_MAT4: bind._dim[1] = 16; break;
} }
bind._type = Shader::SPT_int;
bind._arg = InternalName::make(param_name); bind._arg = InternalName::make(param_name);
bind._dim[0] = 1; bind._dim[0] = 1;
bind._dep[0] = Shader::SSD_general | Shader::SSD_shaderinputs; bind._dep[0] = Shader::SSD_general | Shader::SSD_shaderinputs;
@ -666,23 +665,6 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
case GL_FLOAT_MAT3: bind._dim[1] = 9; break; case GL_FLOAT_MAT3: bind._dim[1] = 9; break;
case GL_FLOAT_MAT4: bind._dim[1] = 16; break; case GL_FLOAT_MAT4: bind._dim[1] = 16; break;
} }
switch (param_type) {
case GL_BOOL:
case GL_BOOL_VEC2:
case GL_BOOL_VEC3:
case GL_BOOL_VEC4:
bind._type = Shader::SPT_unknown;
break;
case GL_INT:
case GL_INT_VEC2:
case GL_INT_VEC3:
case GL_INT_VEC4:
bind._type = Shader::SPT_int;
break;
default:
bind._type = Shader::SPT_float;
break;
}
bind._arg = InternalName::make(param_name); bind._arg = InternalName::make(param_name);
bind._dim[0] = param_size; bind._dim[0] = param_size;
bind._dep[0] = Shader::SSD_general | Shader::SSD_shaderinputs; bind._dep[0] = Shader::SSD_general | Shader::SSD_shaderinputs;