added more images for tests

This commit is contained in:
andrey.zhirnov
2019-06-20 12:19:04 +03:00
parent 2a68c66cc1
commit c0d0df4df0
5 changed files with 31 additions and 1 deletions

View File

@@ -64,6 +64,9 @@ namespace
astc_12x10 = 39,
astc_12x12 = 40,
rgba8 = 0x08080808'61626772ull,
r8 = 0x00000008'00000072ull,
rg8 = 0x00000808'00006772ull,
rgb8 = 0x00080808'00626772ull,
};
enum class pvr_color_space : u32 {
@@ -170,6 +173,21 @@ namespace
out_bytes_per_block = 4;
out_block_size = v2u(1,1);
break;
case pvr_pixel_format::r8:
out_format = image_data_format::g8;
out_bytes_per_block = 1;
out_block_size = v2u(1,1);
break;
case pvr_pixel_format::rg8:
out_format = image_data_format::ga8;
out_bytes_per_block = 2;
out_block_size = v2u(1,1);
break;
case pvr_pixel_format::rgb8:
out_format = image_data_format::rgb8;
out_bytes_per_block = 3;
out_block_size = v2u(1,1);
break;
default:
return false; // unsupported format
}

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4f93405f3302067a0a1bfc05be48c20ef2e12b649d722574497f6dbd64c3b61
size 8259

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:958b8490c189abdebde1f75e8eacbcb8e6ec06dac34baed545e383639e3288d3
size 16451

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba89ed93595405e5159fd245043062d3ed6acc2ee809aab8f7fd787a9bc40208
size 24643

View File

@@ -146,7 +146,10 @@ TEST_CASE("images") {
{"bin/images/ship_etc2.pvr", false, image_data_format(-1)},
{"bin/images/ship_eac_rg11.pvr", false, image_data_format(-1)},
{"bin/images/ship_rgba8.pvr", true, image_data_format::rgba8},
{"bin/images/ship_rgba.dds", true, image_data_format::rgba_dxt5}
{"bin/images/ship_rgba.dds", true, image_data_format::rgba_dxt5},
{"bin/images/ship_r8.pvr", true, image_data_format::g8},
{"bin/images/ship_rg8.pvr", true, image_data_format::ga8},
{"bin/images/ship_rgb8.pvr", true, image_data_format::rgb8}
};
for (auto& info : test_images) {