asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #69633 from clayjohn/GLES3-textures

Browse source 
Use internal texture name when setting texture uniform location in OpenGL renderer
This commit is contained in:
Rémi Verschelde 2022-12-06 11:00:23 +01:00
commit d321bae91e
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gles3/shader_gles3.cpp
View file

@ -36,6 +36,11 @@
#include "core/io/dir_access.h" #include "core/io/dir_access.h"
#include "core/io/file_access.h" #include "core/io/file_access.h"
static String _mkid(const String &p_id) {
String id = "m_" + p_id.replace("__", "_dus_");
return id.replace("__", "_dus_"); //doubleunderscore is reserved in glsl
}
void ShaderGLES3::_add_stage(const char *p_code, StageType p_stage_type) { void ShaderGLES3::_add_stage(const char *p_code, StageType p_stage_type) {
Vector<String> lines = String(p_code).split("\n"); Vector<String> lines = String(p_code).split("\n");
@ -425,7 +430,7 @@ void ShaderGLES3::_compile_specialization(Version::Specialization &spec, uint32_
} }
// textures // textures
for (int i = 0; i < p_version->texture_uniforms.size(); i++) { for (int i = 0; i < p_version->texture_uniforms.size(); i++) {
String native_uniform_name = p_version->texture_uniforms[i]; String native_uniform_name = _mkid(p_version->texture_uniforms[i]);
GLint location = glGetUniformLocation(spec.id, (native_uniform_name).ascii().get_data()); GLint location = glGetUniformLocation(spec.id, (native_uniform_name).ascii().get_data());
glUniform1i(location, i + base_texture_index); glUniform1i(location, i + base_texture_index);
} }