Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ETC support to mipgen / imageio / suzanne.

Browse Source 
This shrinks file size as follows, although it seems to darken the
rendered result.

```
  1398209 Oct  2 16:22 ao.ktx
   699172 Oct  2 16:20 ao_etc.ktx
  1398209 Oct  2 16:22 metallic.ktx
   699172 Oct  2 16:19 metallic_etc.ktx
  1398209 Oct  2 16:22 roughness.ktx
   699172 Oct  2 16:20 roughness_etc.ktx
```
This commit is contained in:
Philip Rideout
2018-10-02 11:32:09 -07:00
parent 2eeb92fc4c
commit cc61e4649b
9 changed files with 236 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/mipgen/src/main.cpp
View File

@@ -81,6 +81,11 @@ Options:
KTX:
astc_[fast|thorough]_[ldr|hdr]_WxH, where WxH is a valid block size
st3c_rgb_dxt1, st3c_rgba_dxt5
etc_FORMAT_METRIC_EFFORT
FORMAT is r11, signed_r11, rg11, signed_rg11, rgb8, srgb8, rgb8_alpha
srgb8_alpha, rgba8, or srgb8_alpha8
METRIC is rgba, rgbx, rec709, numeric, or normalxyz
EFFORT is an integer between 0 and 100
PNG: Ignored
Radiance: Ignored
Photoshop: 16 (default), 32
@@ -90,6 +95,7 @@ Options:
Examples:
MIPGEN -g --kernel=hermite grassland.png mip_%03d.png
MIPGEN -f ktx --compression=astc_fast_ldr_4x4 grassland.png mips.ktx
MIPGEN -f ktx --compression=etc_rgb_rgba_40 grassland.png mips.ktx
)TXT";
static const char* HTML_PREFIX = R"HTML(<!DOCTYPE html>
@@ -278,15 +284,17 @@ int main(int argc, char* argv[]) {
}
AstcConfig astcConfig {};
S3tcConfig s3tcConfig {};
EtcConfig etcConfig {};
if (!g_compression.empty()) {
if (g_compression.substr(0, 5) == "astc_") {
string suffix = g_compression.substr(5);
astcConfig = astcParseOptionString(suffix);
astcConfig = astcParseOptionString(g_compression.substr(5));
} else if (g_compression.substr(0, 5) == "s3tc_") {
string suffix = g_compression.substr(5);
s3tcConfig = s3tcParseOptionString(suffix);
s3tcConfig = s3tcParseOptionString(g_compression.substr(5));
} else if (g_compression.substr(0, 4) == "etc_") {
etcConfig = etcParseOptionString(g_compression.substr(4));
}
if (astcConfig.blocksize[0] == 0 && s3tcConfig.format == CompressedFormat::INVALID) {
if (astcConfig.blocksize[0] == 0 && s3tcConfig.format == CompressedFormat::INVALID
&& etcConfig.format == CompressedFormat::INVALID) {
cerr << "Unrecognized compression: " << g_compression << endl;
return 1;
}
@@ -322,6 +330,14 @@ int main(int argc, char* argv[]) {
info.glInternalFormat = (uint32_t) tex.format;
return;
}
if (etcConfig.format != CompressedFormat::INVALID) {
printf("Starting ETC compression for %s (%dx%d)\n", inputPath.getName().c_str(),
image.getWidth(), image.getHeight());
CompressedTexture tex = etcCompress(image, etcConfig);
container.setBlob({mip++}, tex.data.get(), tex.size);
info.glInternalFormat = (uint32_t) tex.format;
return;
}
if (g_grayscale && g_linearized) {
data = fromLinearToGrayscale<uint8_t>(image);
} else if (g_grayscale) {