diff options
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 5 | ||||
| -rw-r--r-- | drivers/gles2/shaders/cubemap_filter.glsl | 4 | ||||
| -rw-r--r-- | drivers/gles2/shaders/scene.glsl | 4 | ||||
| -rw-r--r-- | scene/resources/texture.cpp | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 45d26e7254..bc734a6597 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -223,16 +223,19 @@ VERTEX_SHADER_CODE #define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) #endif +#endif + #ifdef GL_ARB_shader_texture_lod #extension GL_ARB_shader_texture_lod : enable #endif + #if !defined(GL_EXT_shader_texture_lod) && !defined(GL_ARB_shader_texture_lod) #define texture2DLod(img, coord, lod) texture2D(img, coord, lod) #define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) #endif -#endif + #ifdef USE_GLES_OVER_GL diff --git a/drivers/gles2/shaders/cubemap_filter.glsl b/drivers/gles2/shaders/cubemap_filter.glsl index c9a0fd4ba2..558c83960e 100644 --- a/drivers/gles2/shaders/cubemap_filter.glsl +++ b/drivers/gles2/shaders/cubemap_filter.glsl @@ -33,6 +33,8 @@ void main() { #define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) #endif +#endif + #ifdef GL_ARB_shader_texture_lod #extension GL_ARB_shader_texture_lod : enable #endif @@ -42,7 +44,7 @@ void main() { #define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) #endif -#endif + #ifdef USE_GLES_OVER_GL #define lowp diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index 148b5ae7ef..6aa91df20f 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -664,6 +664,8 @@ VERTEX_SHADER_CODE #define textureCubeLod(img, coord, lod) textureCubeLodEXT(img, coord, lod) #endif +#endif + #ifdef GL_ARB_shader_texture_lod #extension GL_ARB_shader_texture_lod : enable #endif @@ -673,7 +675,7 @@ VERTEX_SHADER_CODE #define textureCubeLod(img, coord, lod) textureCube(img, coord, lod) #endif -#endif + #ifdef USE_GLES_OVER_GL diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 4984af57b5..3870916779 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -185,6 +185,7 @@ void ImageTexture::create(int p_width, int p_height, Image::Format p_format, uin format = p_format; w = p_width; h = p_height; + _change_notify(); } void ImageTexture::create_from_image(const Ref<Image> &p_image, uint32_t p_flags) { @@ -211,6 +212,7 @@ void ImageTexture::set_flags(uint32_t p_flags) { return; //uninitialized, do not set to texture } VisualServer::get_singleton()->texture_set_flags(texture, p_flags); + _change_notify("flags"); } uint32_t ImageTexture::get_flags() const { @@ -712,6 +714,7 @@ Error StreamTexture::load(const String &p_path) { path_to_file = p_path; format = image->get_format(); + _change_notify(); return OK; } String StreamTexture::get_load_path() const { @@ -801,6 +804,7 @@ bool StreamTexture::is_pixel_opaque(int p_x, int p_y) const { void StreamTexture::set_flags(uint32_t p_flags) { flags = p_flags; VS::get_singleton()->texture_set_flags(texture, flags); + _change_notify("flags"); } void StreamTexture::reload_from_file() { |