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

Accept integer samplers

Browse Source
This commit is contained in:
rdb 2014-07-06 09:42:19 +00:00
parent 03eddda4a2
commit d5a61d3705
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,6 +459,8 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
if (param_size == 1) { if (param_size == 1) {
switch (param_type) { switch (param_type) {
#ifndef OPENGLES #ifndef OPENGLES
case GL_INT_SAMPLER_1D:
case GL_UNSIGNED_INT_SAMPLER_1D:
case GL_SAMPLER_1D_SHADOW: case GL_SAMPLER_1D_SHADOW:
case GL_SAMPLER_1D: { case GL_SAMPLER_1D: {
Shader::ShaderTexSpec bind; Shader::ShaderTexSpec bind;
@ -468,6 +470,8 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
bind._stage = texunitno++; bind._stage = texunitno++;
s->_tex_spec.push_back(bind); s->_tex_spec.push_back(bind);
continue; } continue; }
case GL_INT_SAMPLER_2D:
case GL_UNSIGNED_INT_SAMPLER_2D:
case GL_SAMPLER_2D_SHADOW: case GL_SAMPLER_2D_SHADOW:
#endif #endif
case GL_SAMPLER_2D: { case GL_SAMPLER_2D: {
@ -478,6 +482,10 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
bind._stage = texunitno++; bind._stage = texunitno++;
s->_tex_spec.push_back(bind); s->_tex_spec.push_back(bind);
continue; } continue; }
#ifndef OPENGLES
case GL_INT_SAMPLER_3D:
case GL_UNSIGNED_INT_SAMPLER_3D:
#endif
case GL_SAMPLER_3D: { case GL_SAMPLER_3D: {
Shader::ShaderTexSpec bind; Shader::ShaderTexSpec bind;
bind._id = arg_id; bind._id = arg_id;
@ -486,6 +494,11 @@ CLP(ShaderContext)(CLP(GraphicsStateGuardian) *glgsg, Shader *s) : ShaderContext
bind._stage = texunitno++; bind._stage = texunitno++;
s->_tex_spec.push_back(bind); s->_tex_spec.push_back(bind);
continue; } continue; }
#ifndef OPENGLES
case GL_INT_SAMPLER_CUBE:
case GL_UNSIGNED_INT_SAMPLER_CUBE:
case GL_SAMPLER_CUBE_SHADOW:
#endif
case GL_SAMPLER_CUBE: { case GL_SAMPLER_CUBE: {
Shader::ShaderTexSpec bind; Shader::ShaderTexSpec bind;
bind._id = arg_id; bind._id = arg_id;