diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-10-26 18:05:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-26 18:05:37 +0200 |
commit | dba22e9788533362bfb8ba21b5038b92dd9f6615 (patch) | |
tree | e13b3755b8f0008a4eabc2cc930572b5aa2b0ffb /drivers/gles3/rasterizer_storage_gles3.h | |
parent | aa0fa6b14f62c6aeab04345151cf7c2a9f6df79f (diff) | |
parent | 69003457b30b20e34c6bfcb75cd8f0b45c28a77c (diff) |
Merge pull request #33059 from akien-mga/webgl2-resize-non-po2
WebGL 2.0: Force decompressing non power-of-2 textures with repeat/mipmap
Diffstat (limited to 'drivers/gles3/rasterizer_storage_gles3.h')
-rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index 84632308b4..6fe2f123f2 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -266,6 +266,8 @@ public: int mipmaps; + bool is_npot_repeat_mipmap; + bool active; GLuint tex_id; @@ -342,7 +344,7 @@ public: mutable RID_Owner<Texture> texture_owner; - Ref<Image> _get_gl_image_and_format(const Ref<Image> &p_image, Image::Format p_format, uint32_t p_flags, Image::Format &r_real_format, GLenum &r_gl_format, GLenum &r_gl_internal_format, GLenum &r_gl_type, bool &r_compressed, bool &srgb) const; + Ref<Image> _get_gl_image_and_format(const Ref<Image> &p_image, Image::Format p_format, uint32_t p_flags, Image::Format &r_real_format, GLenum &r_gl_format, GLenum &r_gl_internal_format, GLenum &r_gl_type, bool &r_compressed, bool &r_srgb, bool p_force_decompress) const; virtual RID texture_create(); virtual void texture_allocate(RID p_texture, int p_width, int p_height, int p_depth_3d, Image::Format p_format, VS::TextureType p_type, uint32_t p_flags = VS::TEXTURE_FLAGS_DEFAULT); |