diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-02 00:45:01 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-02 00:45:01 +0100 |
| commit | e930fb9a6e4277ad3c4dc60a775785b294840512 (patch) | |
| tree | 64b569fa72aa8a8d58d80969fc523c5fbb7f3c34 /drivers | |
| parent | 7bad1706c2fe71aac6d02b5a445a3faeb1e44d76 (diff) | |
Fix typo in 7bad170
And cleanup.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/shader_gles2.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index ee96db99fe..df7b170bf4 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -839,7 +839,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } else if (E->get().default_value.size()) { @@ -970,7 +970,7 @@ void ShaderGLES2::use_material(void *p_material) { // Nothing to do? } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } else { //zero @@ -1041,7 +1041,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; case ShaderLanguage::TYPE_MAT2: { - GLfloat mat[4]{ 0, 0, 0, 0 }; + GLfloat mat[4] = { 0, 0, 0, 0 }; glUniformMatrix2fv(location, 1, GL_FALSE, mat); } break; @@ -1054,22 +1054,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; case ShaderLanguage::TYPE_MAT4: { - GLfloat mat[16] = { 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 }; + GLfloat mat[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; glUniformMatrix4fv(location, 1, GL_FALSE, mat); @@ -1104,7 +1089,7 @@ void ShaderGLES2::use_material(void *p_material) { // Nothing to do? } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } |