Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix import logic for VRAM compressed texture formats #42118

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+36 −17
Open

Fix import logic for VRAM compressed texture formats #42118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 36 additions & 17 deletions editor/import/resource_importer_texture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,8 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
f->store_8('S');
f->store_8('T'); //godot streamable texture

bool resize_to_po2 = false;

if (p_compress_mode == COMPRESS_VIDEO_RAM && p_force_po2_for_compressed && (p_mipmaps || p_texture_flags & Texture::FLAG_REPEAT)) {
resize_to_po2 = true;
f->store_16(next_power_of_2(p_image->get_width()));
f->store_16(p_image->get_width());
f->store_16(next_power_of_2(p_image->get_height()));
f->store_16(p_image->get_height());
} else {
f->store_16(p_image->get_width());
f->store_16(0);
f->store_16(p_image->get_height());
f->store_16(0);
}
f->store_32(p_texture_flags);
int orig_width = p_image->get_width();
int orig_height = p_image->get_height();

uint32_t format = 0;

Expand All @@ -263,6 +250,12 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
switch (p_compress_mode) {
case COMPRESS_LOSSLESS: {

f->store_16(orig_width);
f->store_16(0);
f->store_16(orig_height);
f->store_16(0);
f->store_32(p_texture_flags);

Ref<Image> image = p_image->duplicate();
if (p_mipmaps) {
image->generate_mipmaps();
Expand Down Expand Up @@ -292,6 +285,13 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String

} break;
case COMPRESS_LOSSY: {

f->store_16(orig_width);
f->store_16(0);
f->store_16(orig_height);
f->store_16(0);
f->store_32(p_texture_flags);

Ref<Image> image = p_image->duplicate();
if (p_mipmaps) {
image->generate_mipmaps();
Expand Down Expand Up @@ -322,9 +322,15 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
case COMPRESS_VIDEO_RAM: {

Ref<Image> image = p_image->duplicate();
if (resize_to_po2) {
image->resize_to_po2();

if (p_force_po2_for_compressed || p_mipmaps || p_texture_flags & Texture::FLAG_REPEAT) {
if (p_vram_compression == Image::COMPRESS_PVRTC4 || p_vram_compression == Image::COMPRESS_ETC) {
// we don't need to resize image there, because encoder will resize it by more proper way
} else {
image->resize_to_po2();
}
}

if (p_mipmaps) {
image->generate_mipmaps(p_force_normal);
}
Expand All @@ -342,6 +348,13 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
image->compress(p_vram_compression, csource, p_lossy_quality);
}

// save image dimensions after compressing, because the compressor can resize it
f->store_16(image->get_width());
f->store_16(orig_width);
f->store_16(image->get_height());
f->store_16(orig_height);
f->store_32(p_texture_flags);

format |= image->get_format();

f->store_32(format);
Expand All @@ -353,6 +366,12 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
} break;
case COMPRESS_UNCOMPRESSED: {

f->store_16(orig_width);
f->store_16(0);
f->store_16(orig_height);
f->store_16(0);
f->store_32(p_texture_flags);

Ref<Image> image = p_image->duplicate();
if (p_mipmaps) {
image->generate_mipmaps();
Expand Down