diff options
Diffstat (limited to 'drivers/gles2')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles2/shader_gles2.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 9fe7e43b43..b08202ae45 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -811,7 +811,7 @@ Ref<Image> RasterizerStorageGLES2::texture_get_data(RID p_texture, int p_layer) data.resize(data_size); - Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1 ? true : false, real_format, data)); + Image *img = memnew(Image(texture->alloc_width, texture->alloc_height, texture->mipmaps > 1, real_format, data)); return Ref<Image>(img); #else diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index df7b170bf4..58eff791ca 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -182,14 +182,11 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() { #endif - int define_line_ofs = 1; - for (int j = 0; j < conditional_count; j++) { bool enable = (conditional_version.version & (1 << j)) > 0; if (enable) { strings.push_back(conditional_defines[j]); - define_line_ofs++; DEBUG_PRINT(conditional_defines[j]); } } @@ -206,7 +203,6 @@ ShaderGLES2::Version *ShaderGLES2::get_current_version() { ERR_FAIL_COND_V(!cc, NULL); v.code_version = cc->version; - define_line_ofs += 2; } // program |