diff --git a/ILImageSupport.cpp b/ILImageSupport.cpp index 30dbbbc..7f57647 100644 --- a/ILImageSupport.cpp +++ b/ILImageSupport.cpp @@ -140,7 +140,7 @@ bool ILImage::LoadFile(const OSString &filename) if(!ilLoadImage(filename.c_str())) return(false); - LOG_INFO(OS_TEXT("File: ")+filename); + LOG_INFO(OS_TEXT("\nFile: ")+filename); il_width =ilGetInteger(IL_IMAGE_WIDTH); il_height =ilGetInteger(IL_IMAGE_HEIGHT); diff --git a/TextureFileCreaterCompress.cpp b/TextureFileCreaterCompress.cpp index 0effa2a..368e46c 100644 --- a/TextureFileCreaterCompress.cpp +++ b/TextureFileCreaterCompress.cpp @@ -158,21 +158,38 @@ public: CMP_FORMAT_BC6H_SF, //ColorFormat::BC6H_SF CMP_FORMAT_BC7, //ColorFormat::BC7 }; + + constexpr char fmt_name_list[][8]= + { + "BC1RGB", + "BC1RGBA", + "BC2", + "BC3", + "BC4", + "BC5", + "BC6H", + "BC6H_SF", + "BC7" + }; + + const int fmt_index=size_t(fmt->format)-size_t(ColorFormat::BC1RGB); kernel_options.height =image->height(); kernel_options.width =image->width(); kernel_options.fquality =1.0f; - kernel_options.format =fmt_list[size_t(fmt->format)-size_t(ColorFormat::BC1RGB)]; + kernel_options.format =fmt_list[fmt_index]; kernel_options.encodeWith =CMP_HPC; kernel_options.threads =4; kernel_options.getPerfStats =false; kernel_options.getDeviceInfo=false; + + std::cout<<"CompressFormat: "<