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

Bind textures to image samplers by default with read/write access without warning

Browse Source
This commit is contained in:
rdb 2015-05-24 15:03:08 +01:00
parent e2dfc935a1
commit 5d84cc22a9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1857,10 +1857,8 @@ update_shader_texture_bindings(ShaderContext *prev) {
tex = param->get_texture(); tex = param->get_texture();
} else if (sinp->get_value_type() == ShaderInput::M_texture) { } else if (sinp->get_value_type() == ShaderInput::M_texture) {
// This used to be legal, so just issue a warning. // People find it convenient to be able to pass a texture without further ado.
tex = sinp->get_texture(); tex = sinp->get_texture();
GLCAT.warning()
<< "Texture input " << *input._name << " was not specified as an image binding\n";
} else { } else {
GLCAT.error() GLCAT.error()
@ -1904,7 +1902,7 @@ update_shader_texture_bindings(ShaderContext *prev) {
internal_format = _glgsg->get_internal_image_format(tex, true); internal_format = _glgsg->get_internal_image_format(tex, true);
} }
GLenum access = GL_READ_ONLY; GLenum access = GL_READ_WRITE;
GLint bind_level = 0; GLint bind_level = 0;
GLint bind_layer = 0; GLint bind_layer = 0;
GLboolean layered = GL_TRUE; GLboolean layered = GL_TRUE;