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

No longer force mipmaps on import of VRAM textures, closes #10221

Browse source
This commit is contained in:
Juan Linietsky 2018-11-02 12:25:43 -03:00
parent 9b2c441ae3
commit 08612e1cfd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/import/resource_importer_texture.cpp
View file

@ -235,7 +235,7 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
if (p_streamable) if (p_streamable)
format |= StreamTexture::FORMAT_BIT_STREAM; format |= StreamTexture::FORMAT_BIT_STREAM;
if (p_mipmaps || p_compress_mode == COMPRESS_VIDEO_RAM) //VRAM always uses mipmaps if (p_mipmaps)
format |= StreamTexture::FORMAT_BIT_HAS_MIPMAPS; //mipmaps bit format |= StreamTexture::FORMAT_BIT_HAS_MIPMAPS; //mipmaps bit
if (p_detect_3d) if (p_detect_3d)
format |= StreamTexture::FORMAT_BIT_DETECT_3D; format |= StreamTexture::FORMAT_BIT_DETECT_3D;
@ -310,7 +310,9 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
case COMPRESS_VIDEO_RAM: { case COMPRESS_VIDEO_RAM: {
Ref<Image> image = p_image->duplicate(); Ref<Image> image = p_image->duplicate();
image->generate_mipmaps(p_force_normal); if (p_mipmaps) {
image->generate_mipmaps(p_force_normal);
}
if (p_force_rgbe && image->get_format() >= Image::FORMAT_R8 && image->get_format() <= Image::FORMAT_RGBE9995) { if (p_force_rgbe && image->get_format() >= Image::FORMAT_R8 && image->get_format() <= Image::FORMAT_RGBE9995) {
image->convert(Image::FORMAT_RGBE9995); image->convert(Image::FORMAT_RGBE9995);