From 5d84cc22a9bb89c91644646308d6e3b37e77a356 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 24 May 2015 15:03:08 +0100 Subject: [PATCH] Bind textures to image samplers by default with read/write access without warning --- panda/src/glstuff/glShaderContext_src.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index 5774db6909..3d3a6d1315 100644 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -1857,10 +1857,8 @@ update_shader_texture_bindings(ShaderContext *prev) { tex = param->get_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(); - GLCAT.warning() - << "Texture input " << *input._name << " was not specified as an image binding\n"; } else { GLCAT.error() @@ -1904,7 +1902,7 @@ update_shader_texture_bindings(ShaderContext *prev) { 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_layer = 0; GLboolean layered = GL_TRUE;