godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Was missing calling _mkid() in shader_gles2.cpp, regarding fix for #12880

Browse Source
This commit is contained in:
Juan Linietsky 2018-11-10 10:52:24 -03:00
parent f00b522705
commit 3e128a6d8a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gles2/shader_gles2.cpp
View File

@ -196,6 +196,12 @@ static void _display_error_with_code(const String &p_error, const Vector<const c
ERR_PRINTS(p_error); ERR_PRINTS(p_error);
} }
static String _mkid(const String &p_id) {
String id = "m_" + p_id;
return id.replace("__", "_dus_"); //doubleunderscore is reserverd in glsl
}
ShaderGLES2::Version *ShaderGLES2::get_current_version() { ShaderGLES2::Version *ShaderGLES2::get_current_version() {
Version *_v = version_map.getptr(conditional_version); Version *_v = version_map.getptr(conditional_version);
@ -492,15 +498,15 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() {
if (cc) { if (cc) {
// uniforms // uniforms
for (int i = 0; i < cc->custom_uniforms.size(); i++) { for (int i = 0; i < cc->custom_uniforms.size(); i++) {
StringName native_uniform_name = "m_" + cc->custom_uniforms[i]; String native_uniform_name = _mkid(cc->custom_uniforms[i]);
GLint location = glGetUniformLocation(v.id, ((String)native_uniform_name).ascii().get_data()); GLint location = glGetUniformLocation(v.id, (native_uniform_name).ascii().get_data());
v.custom_uniform_locations[cc->custom_uniforms[i]] = location; v.custom_uniform_locations[cc->custom_uniforms[i]] = location;
} }
// textures // textures
for (int i = 0; i < cc->texture_uniforms.size(); i++) { for (int i = 0; i < cc->texture_uniforms.size(); i++) {
StringName native_uniform_name = "m_" + cc->texture_uniforms[i]; String native_uniform_name = _mkid(cc->texture_uniforms[i]);
GLint location = glGetUniformLocation(v.id, ((String)native_uniform_name).ascii().get_data()); GLint location = glGetUniformLocation(v.id, (native_uniform_name).ascii().get_data());
v.custom_uniform_locations[cc->texture_uniforms[i]] = location; v.custom_uniform_locations[cc->texture_uniforms[i]] = location;
} }
} }