From 66bdda7521984bd04a370562d0ce99ff54f538cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Fri, 2 Jun 2023 08:52:57 +0200 Subject: [PATCH] texture import BC conversion fix: do block alignment after format was determined --- WickedEngine/wiResourceManager.cpp | 6 +++--- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WickedEngine/wiResourceManager.cpp b/WickedEngine/wiResourceManager.cpp index a76eb830d..bb63691a0 100644 --- a/WickedEngine/wiResourceManager.cpp +++ b/WickedEngine/wiResourceManager.cpp @@ -853,9 +853,6 @@ namespace wi Texture uncompressed_src = std::move(resource->texture); resource->srgb_subresource = -1; - desc.width = AlignTo(desc.width, GetFormatBlockSize(desc.format)); - desc.height = AlignTo(desc.height, GetFormatBlockSize(desc.format)); - desc.format = Format::BC1_UNORM; if (has_flag(flags, Flags::IMPORT_NORMALMAP)) { @@ -900,6 +897,9 @@ namespace wi } desc.bind_flags = BindFlag::SHADER_RESOURCE; + desc.width = AlignTo(desc.width, GetFormatBlockSize(desc.format)); + desc.height = AlignTo(desc.height, GetFormatBlockSize(desc.format)); + success = device->CreateTexture(&desc, nullptr, &resource->texture); device->SetName(&resource->texture, name.c_str()); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 0c64199e2..0512d404b 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 217; + const int revision = 218; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);