diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp index a2ac0a3c23..203c85910f 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp @@ -73,90 +73,104 @@ struct formatconverstion_t { // Format/Type to combined format code table. // Sorted and indexed to allow fast searches. static const formatconverstion_t FormatLUT[] = { - {FMT_1_5_5_5, TYPE_UNORM, CFMT_1_5_5_5_UNORM}, - {FMT_10_10_10_2, TYPE_UNORM, CFMT_10_10_10_2_UNORM}, - {FMT_10_10_10_2, TYPE_SNORM, CFMT_10_10_10_2_SNORM}, - {FMT_10_10_10_2, TYPE_UINT, CFMT_10_10_10_2_UINT}, - {FMT_10_10_10_2, TYPE_SINT, CFMT_10_10_10_2_SINT}, - {FMT_16, TYPE_UNORM, CFMT_16_UNORM}, - {FMT_16, TYPE_SNORM, CFMT_16_SNORM}, - {FMT_16, TYPE_UINT, CFMT_16_UINT}, - {FMT_16, TYPE_SINT, CFMT_16_SINT}, - {FMT_16, TYPE_FLOAT, CFMT_16_FLOAT}, - {FMT_16_16, TYPE_UNORM, CFMT_16_16_UNORM}, - {FMT_16_16, TYPE_SNORM, CFMT_16_16_SNORM}, - {FMT_16_16, TYPE_UINT, CFMT_16_16_UINT}, - {FMT_16_16, TYPE_SINT, CFMT_16_16_SINT}, - {FMT_16_16, TYPE_FLOAT, CFMT_16_16_FLOAT}, - {FMT_16_16_16_16, TYPE_UNORM, CFMT_16_16_16_16_UNORM}, - {FMT_16_16_16_16, TYPE_SNORM, CFMT_16_16_16_16_SNORM}, - {FMT_16_16_16_16, TYPE_UINT, CFMT_16_16_16_16_UINT}, - {FMT_16_16_16_16, TYPE_SINT, CFMT_16_16_16_16_SINT}, - {FMT_16_16_16_16, TYPE_FLOAT, CFMT_16_16_16_16_FLOAT}, - {FMT_2_10_10_10, TYPE_UNORM, CFMT_2_10_10_10_UNORM}, - {FMT_2_10_10_10, TYPE_SNORM, CFMT_2_10_10_10_SNORM}, - {FMT_2_10_10_10, TYPE_UINT, CFMT_2_10_10_10_UINT}, - {FMT_2_10_10_10, TYPE_SINT, CFMT_2_10_10_10_SINT}, - {FMT_24_8, TYPE_UNORM, CFMT_24_8_UNORM}, - {FMT_24_8, TYPE_UINT, CFMT_24_8_UINT}, - {FMT_32, TYPE_UINT, CFMT_32_UINT}, - {FMT_32, TYPE_SINT, CFMT_32_SINT}, - {FMT_32, TYPE_FLOAT, CFMT_32_FLOAT}, - {FMT_32_32, TYPE_UINT, CFMT_32_32_UINT}, - {FMT_32_32, TYPE_SINT, CFMT_32_32_SINT}, - {FMT_32_32, TYPE_FLOAT, CFMT_32_32_FLOAT}, - {FMT_32_32_32, TYPE_UINT, CFMT_32_32_32_UINT}, - {FMT_32_32_32, TYPE_SINT, CFMT_32_32_32_SINT}, - {FMT_32_32_32, TYPE_FLOAT, CFMT_32_32_32_FLOAT}, - {FMT_32_32_32_32, TYPE_UINT, CFMT_32_32_32_32_UINT}, - {FMT_32_32_32_32, TYPE_SINT, CFMT_32_32_32_32_SINT}, - {FMT_32_32_32_32, TYPE_FLOAT, CFMT_32_32_32_32_FLOAT}, - {FMT_5_5_5_1, TYPE_UNORM, CFMT_5_5_5_1_UNORM}, - {FMT_5_6_5, TYPE_UNORM, CFMT_5_6_5_UNORM}, - {FMT_8, TYPE_UNORM, CFMT_8_UNORM}, - {FMT_8, TYPE_SNORM, CFMT_8_SNORM}, - {FMT_8, TYPE_UINT, CFMT_8_UINT}, - {FMT_8, TYPE_SINT, CFMT_8_SINT}, - {FMT_8, TYPE_SRGB, CFMT_8_SRGB}, - {FMT_8_24, TYPE_UNORM, CFMT_8_24_UNORM}, - {FMT_8_24, TYPE_UINT, CFMT_8_24_UINT}, - {FMT_8_8, TYPE_UNORM, CFMT_8_8_UNORM}, - {FMT_8_8, TYPE_SNORM, CFMT_8_8_SNORM}, - {FMT_8_8, TYPE_UINT, CFMT_8_8_UINT}, - {FMT_8_8, TYPE_SINT, CFMT_8_8_SINT}, - {FMT_8_8, TYPE_SRGB, CFMT_8_8_SRGB}, - {FMT_8_8_8_8, TYPE_UNORM, CFMT_8_8_8_8_UNORM}, - {FMT_8_8_8_8, TYPE_SNORM, CFMT_8_8_8_8_SNORM}, - {FMT_8_8_8_8, TYPE_UINT, CFMT_8_8_8_8_UINT}, - {FMT_8_8_8_8, TYPE_SINT, CFMT_8_8_8_8_SINT}, - {FMT_8_8_8_8, TYPE_SRGB, CFMT_8_8_8_8_SRGB} + {FMT_1_5_5_5, TYPE_UNORM, CFMT_1_5_5_5_UNORM}, // 0 + {FMT_10_10_10_2, TYPE_UNORM, CFMT_10_10_10_2_UNORM}, // 1 + {FMT_10_10_10_2, TYPE_SNORM, CFMT_10_10_10_2_SNORM}, // 2 + {FMT_10_10_10_2, TYPE_UINT, CFMT_10_10_10_2_UINT}, // 3 + {FMT_10_10_10_2, TYPE_SINT, CFMT_10_10_10_2_SINT}, // 4 + {FMT_16, TYPE_UNORM, CFMT_16_UNORM}, // 5 + {FMT_16, TYPE_SNORM, CFMT_16_SNORM}, // 6 + {FMT_16, TYPE_UINT, CFMT_16_UINT}, // 7 + {FMT_16, TYPE_SINT, CFMT_16_SINT}, // 8 + {FMT_16, TYPE_FLOAT, CFMT_16_FLOAT}, // 9 + {FMT_16, TYPE_USCALED, CFMT_16_USCALED}, // 10 + {FMT_16, TYPE_SSCALED, CFMT_16_SSCALED}, // 11 + {FMT_16_16, TYPE_UNORM, CFMT_16_16_UNORM}, // 12 + {FMT_16_16, TYPE_SNORM, CFMT_16_16_SNORM}, // 13 + {FMT_16_16, TYPE_UINT, CFMT_16_16_UINT}, // 14 + {FMT_16_16, TYPE_SINT, CFMT_16_16_SINT}, // 15 + {FMT_16_16, TYPE_FLOAT, CFMT_16_16_FLOAT}, // 16 + {FMT_16_16, TYPE_USCALED, CFMT_16_16_USCALED}, // 17 + {FMT_16_16, TYPE_SSCALED, CFMT_16_16_SSCALED}, // 18 + {FMT_16_16_16_16, TYPE_UNORM, CFMT_16_16_16_16_UNORM}, // 19 + {FMT_16_16_16_16, TYPE_SNORM, CFMT_16_16_16_16_SNORM}, // 20 + {FMT_16_16_16_16, TYPE_UINT, CFMT_16_16_16_16_UINT}, // 21 + {FMT_16_16_16_16, TYPE_SINT, CFMT_16_16_16_16_SINT}, // 22 + {FMT_16_16_16_16, TYPE_FLOAT, CFMT_16_16_16_16_FLOAT}, // 23 + {FMT_16_16_16_16, TYPE_USCALED, CFMT_16_16_16_16_USCALED}, // 24 + {FMT_16_16_16_16, TYPE_SSCALED, CFMT_16_16_16_16_SSCALED}, // 25 + {FMT_2_10_10_10, TYPE_UNORM, CFMT_2_10_10_10_UNORM}, // 26 + {FMT_2_10_10_10, TYPE_SNORM, CFMT_2_10_10_10_SNORM}, // 27 + {FMT_2_10_10_10, TYPE_UINT, CFMT_2_10_10_10_UINT}, // 28 + {FMT_2_10_10_10, TYPE_SINT, CFMT_2_10_10_10_SINT}, // 29 + {FMT_2_10_10_10, TYPE_USCALED, CFMT_2_10_10_10_USCALED}, // 30 + {FMT_2_10_10_10, TYPE_SSCALED, CFMT_2_10_10_10_SSCALED}, // 31 + {FMT_24_8, TYPE_UNORM, CFMT_24_8_UNORM}, // 32 + {FMT_24_8, TYPE_UINT, CFMT_24_8_UINT}, // 33 + {FMT_32, TYPE_UINT, CFMT_32_UINT}, // 34 + {FMT_32, TYPE_SINT, CFMT_32_SINT}, // 35 + {FMT_32, TYPE_FLOAT, CFMT_32_FLOAT}, // 36 + {FMT_32_32, TYPE_UINT, CFMT_32_32_UINT}, // 37 + {FMT_32_32, TYPE_SINT, CFMT_32_32_SINT}, // 38 + {FMT_32_32, TYPE_FLOAT, CFMT_32_32_FLOAT}, // 39 + {FMT_32_32_32, TYPE_UINT, CFMT_32_32_32_UINT}, // 40 + {FMT_32_32_32, TYPE_SINT, CFMT_32_32_32_SINT}, // 41 + {FMT_32_32_32, TYPE_FLOAT, CFMT_32_32_32_FLOAT}, // 42 + {FMT_32_32_32_32, TYPE_UINT, CFMT_32_32_32_32_UINT}, // 43 + {FMT_32_32_32_32, TYPE_SINT, CFMT_32_32_32_32_SINT}, // 44 + {FMT_32_32_32_32, TYPE_FLOAT, CFMT_32_32_32_32_FLOAT}, // 45 + {FMT_5_5_5_1, TYPE_UNORM, CFMT_5_5_5_1_UNORM}, // 46 + {FMT_5_6_5, TYPE_UNORM, CFMT_5_6_5_UNORM}, // 47 + {FMT_8, TYPE_UNORM, CFMT_8_UNORM}, // 48 + {FMT_8, TYPE_SNORM, CFMT_8_SNORM}, // 49 + {FMT_8, TYPE_UINT, CFMT_8_UINT}, // 50 + {FMT_8, TYPE_SINT, CFMT_8_SINT}, // 51 + {FMT_8, TYPE_SRGB, CFMT_8_SRGB}, // 52 + {FMT_8, TYPE_USCALED, CFMT_8_USCALED}, // 53 + {FMT_8, TYPE_SSCALED, CFMT_8_SSCALED}, // 54 + {FMT_8_24, TYPE_UNORM, CFMT_8_24_UNORM}, // 55 + {FMT_8_24, TYPE_UINT, CFMT_8_24_UINT}, // 56 + {FMT_8_8, TYPE_UNORM, CFMT_8_8_UNORM}, // 57 + {FMT_8_8, TYPE_SNORM, CFMT_8_8_SNORM}, // 58 + {FMT_8_8, TYPE_UINT, CFMT_8_8_UINT}, // 59 + {FMT_8_8, TYPE_SINT, CFMT_8_8_SINT}, // 60 + {FMT_8_8, TYPE_SRGB, CFMT_8_8_SRGB}, // 61 + {FMT_8_8, TYPE_USCALED, CFMT_8_8_USCALED}, // 62 + {FMT_8_8, TYPE_SSCALED, CFMT_8_8_SSCALED}, // 63 + {FMT_8_8_8_8, TYPE_UNORM, CFMT_8_8_8_8_UNORM}, // 64 + {FMT_8_8_8_8, TYPE_SNORM, CFMT_8_8_8_8_SNORM}, // 65 + {FMT_8_8_8_8, TYPE_UINT, CFMT_8_8_8_8_UINT}, // 66 + {FMT_8_8_8_8, TYPE_SINT, CFMT_8_8_8_8_SINT}, // 67 + {FMT_8_8_8_8, TYPE_SRGB, CFMT_8_8_8_8_SRGB}, // 68 + {FMT_8_8_8_8, TYPE_USCALED, CFMT_8_8_8_8_USCALED}, // 69 + {FMT_8_8_8_8, TYPE_SSCALED, CFMT_8_8_8_8_SSCALED} // 70 }; static const int FormatLUTSize = sizeof(FormatLUT)/sizeof(formatconverstion_t); //Index in FormatLUT to start search, indexed by FMT enum. static const int FormatEntryPoint[] = { - 57, - 40, - 5, - 47, - 26, - 10, - 57, - 57, - 1, - 20, - 52, - 29, - 15, - 32, - 35, - 57, - 39, - 0, - 38, - 57, - 45, - 24 + 71, // FMT_INVALID + 48, // FMT_8 + 5, // FMT_16 + 57, // FMT_8_8 + 34, // FMT_32 + 12, // FMT_16_16 + 71, // FMT_10_11_11 + 71, // FMT_11_11_10 + 1, // FMT_10_10_10_2 + 26, // FMT_2_10_10_10 + 64, // FMT_8_8_8_8 + 37, // FMT_32_32 + 19, // FMT_16_16_16_16 + 40, // FMT_32_32_32 + 43, // FMT_32_32_32_32 + 71, // RESERVED + 47, // FMT_5_6_5 + 0, // FMT_1_5_5_5 + 46, // FMT_5_5_5_1 + 71, // FMT_4_4_4_4 + 55, // FMT_8_24 + 32 // FMT_24_8 }; static FORMAT GetCombinedFormat(uint8_t fmt, uint8_t type) { diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp old mode 100755 new mode 100644 index 7312f6d807..5d0f297bbd --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp @@ -73,63 +73,63 @@ struct formatconverstion_t { // Format/Type to combined format code table. // Sorted and indexed to allow fast searches. static const formatconverstion_t FormatLUT[] = { - {FMT_1_5_5_5, TYPE_UNORM, CFMT_1_5_5_5_UNORM}, - {FMT_10_10_10_2, TYPE_UNORM, CFMT_10_10_10_2_UNORM}, - {FMT_10_10_10_2, TYPE_SNORM, CFMT_10_10_10_2_SNORM}, - {FMT_10_10_10_2, TYPE_UINT, CFMT_10_10_10_2_UINT}, - {FMT_10_10_10_2, TYPE_SINT, CFMT_10_10_10_2_SINT}, - {FMT_16, TYPE_UNORM, CFMT_16_UNORM}, - {FMT_16, TYPE_SNORM, CFMT_16_SNORM}, - {FMT_16, TYPE_UINT, CFMT_16_UINT}, - {FMT_16, TYPE_SINT, CFMT_16_SINT}, - {FMT_16, TYPE_FLOAT, CFMT_16_FLOAT}, - {FMT_16_16, TYPE_UNORM, CFMT_16_16_UNORM}, - {FMT_16_16, TYPE_SNORM, CFMT_16_16_SNORM}, - {FMT_16_16, TYPE_UINT, CFMT_16_16_UINT}, - {FMT_16_16, TYPE_SINT, CFMT_16_16_SINT}, - {FMT_16_16, TYPE_FLOAT, CFMT_16_16_FLOAT}, - {FMT_16_16_16_16, TYPE_UNORM, CFMT_16_16_16_16_UNORM}, - {FMT_16_16_16_16, TYPE_SNORM, CFMT_16_16_16_16_SNORM}, - {FMT_16_16_16_16, TYPE_UINT, CFMT_16_16_16_16_UINT}, - {FMT_16_16_16_16, TYPE_SINT, CFMT_16_16_16_16_SINT}, - {FMT_16_16_16_16, TYPE_FLOAT, CFMT_16_16_16_16_FLOAT}, - {FMT_2_10_10_10, TYPE_UNORM, CFMT_2_10_10_10_UNORM}, - {FMT_2_10_10_10, TYPE_SNORM, CFMT_2_10_10_10_SNORM}, - {FMT_2_10_10_10, TYPE_UINT, CFMT_2_10_10_10_UINT}, - {FMT_2_10_10_10, TYPE_SINT, CFMT_2_10_10_10_SINT}, - {FMT_24_8, TYPE_UNORM, CFMT_24_8_UNORM}, - {FMT_24_8, TYPE_UINT, CFMT_24_8_UINT}, - {FMT_32, TYPE_UINT, CFMT_32_UINT}, - {FMT_32, TYPE_SINT, CFMT_32_SINT}, - {FMT_32, TYPE_FLOAT, CFMT_32_FLOAT}, - {FMT_32_32, TYPE_UINT, CFMT_32_32_UINT}, - {FMT_32_32, TYPE_SINT, CFMT_32_32_SINT}, - {FMT_32_32, TYPE_FLOAT, CFMT_32_32_FLOAT}, - {FMT_32_32_32, TYPE_UINT, CFMT_32_32_32_UINT}, - {FMT_32_32_32, TYPE_SINT, CFMT_32_32_32_SINT}, - {FMT_32_32_32, TYPE_FLOAT, CFMT_32_32_32_FLOAT}, - {FMT_32_32_32_32, TYPE_UINT, CFMT_32_32_32_32_UINT}, - {FMT_32_32_32_32, TYPE_SINT, CFMT_32_32_32_32_SINT}, - {FMT_32_32_32_32, TYPE_FLOAT, CFMT_32_32_32_32_FLOAT}, - {FMT_5_5_5_1, TYPE_UNORM, CFMT_5_5_5_1_UNORM}, - {FMT_5_6_5, TYPE_UNORM, CFMT_5_6_5_UNORM}, - {FMT_8, TYPE_UNORM, CFMT_8_UNORM}, - {FMT_8, TYPE_SNORM, CFMT_8_SNORM}, - {FMT_8, TYPE_UINT, CFMT_8_UINT}, - {FMT_8, TYPE_SINT, CFMT_8_SINT}, - {FMT_8, TYPE_SRGB, CFMT_8_SRGB}, - {FMT_8_24, TYPE_UNORM, CFMT_8_24_UNORM}, - {FMT_8_24, TYPE_UINT, CFMT_8_24_UINT}, - {FMT_8_8, TYPE_UNORM, CFMT_8_8_UNORM}, - {FMT_8_8, TYPE_SNORM, CFMT_8_8_SNORM}, - {FMT_8_8, TYPE_UINT, CFMT_8_8_UINT}, - {FMT_8_8, TYPE_SINT, CFMT_8_8_SINT}, - {FMT_8_8, TYPE_SRGB, CFMT_8_8_SRGB}, - {FMT_8_8_8_8, TYPE_UNORM, CFMT_8_8_8_8_UNORM}, - {FMT_8_8_8_8, TYPE_SNORM, CFMT_8_8_8_8_SNORM}, - {FMT_8_8_8_8, TYPE_UINT, CFMT_8_8_8_8_UINT}, - {FMT_8_8_8_8, TYPE_SINT, CFMT_8_8_8_8_SINT}, - {FMT_8_8_8_8, TYPE_SRGB, CFMT_8_8_8_8_SRGB} + {FMT_1_5_5_5, TYPE_UNORM, CFMT_1_5_5_5_UNORM}, // 0 + {FMT_10_10_10_2, TYPE_UNORM, CFMT_10_10_10_2_UNORM}, // 1 + {FMT_10_10_10_2, TYPE_SNORM, CFMT_10_10_10_2_SNORM}, // 2 + {FMT_10_10_10_2, TYPE_UINT, CFMT_10_10_10_2_UINT}, // 3 + {FMT_10_10_10_2, TYPE_SINT, CFMT_10_10_10_2_SINT}, // 4 + {FMT_16, TYPE_UNORM, CFMT_16_UNORM}, // 5 + {FMT_16, TYPE_SNORM, CFMT_16_SNORM}, // 6 + {FMT_16, TYPE_UINT, CFMT_16_UINT}, // 7 + {FMT_16, TYPE_SINT, CFMT_16_SINT}, // 8 + {FMT_16, TYPE_FLOAT, CFMT_16_FLOAT}, // 9 + {FMT_16_16, TYPE_UNORM, CFMT_16_16_UNORM}, // 10 + {FMT_16_16, TYPE_SNORM, CFMT_16_16_SNORM}, // 11 + {FMT_16_16, TYPE_UINT, CFMT_16_16_UINT}, // 12 + {FMT_16_16, TYPE_SINT, CFMT_16_16_SINT}, // 13 + {FMT_16_16, TYPE_FLOAT, CFMT_16_16_FLOAT}, // 14 + {FMT_16_16_16_16, TYPE_UNORM, CFMT_16_16_16_16_UNORM}, // 15 + {FMT_16_16_16_16, TYPE_SNORM, CFMT_16_16_16_16_SNORM}, // 16 + {FMT_16_16_16_16, TYPE_UINT, CFMT_16_16_16_16_UINT}, // 17 + {FMT_16_16_16_16, TYPE_SINT, CFMT_16_16_16_16_SINT}, // 18 + {FMT_16_16_16_16, TYPE_FLOAT, CFMT_16_16_16_16_FLOAT}, // 19 + {FMT_2_10_10_10, TYPE_UNORM, CFMT_2_10_10_10_UNORM}, // 20 + {FMT_2_10_10_10, TYPE_SNORM, CFMT_2_10_10_10_SNORM}, // 21 + {FMT_2_10_10_10, TYPE_UINT, CFMT_2_10_10_10_UINT}, // 22 + {FMT_2_10_10_10, TYPE_SINT, CFMT_2_10_10_10_SINT}, // 23 + {FMT_24_8, TYPE_UNORM, CFMT_24_8_UNORM}, // 24 + {FMT_24_8, TYPE_UINT, CFMT_24_8_UINT}, // 25 + {FMT_32, TYPE_UINT, CFMT_32_UINT}, // 26 + {FMT_32, TYPE_SINT, CFMT_32_SINT}, // 27 + {FMT_32, TYPE_FLOAT, CFMT_32_FLOAT}, // 28 + {FMT_32_32, TYPE_UINT, CFMT_32_32_UINT}, // 29 + {FMT_32_32, TYPE_SINT, CFMT_32_32_SINT}, // 30 + {FMT_32_32, TYPE_FLOAT, CFMT_32_32_FLOAT}, // 31 + {FMT_32_32_32, TYPE_UINT, CFMT_32_32_32_UINT}, // 32 + {FMT_32_32_32, TYPE_SINT, CFMT_32_32_32_SINT}, // 33 + {FMT_32_32_32, TYPE_FLOAT, CFMT_32_32_32_FLOAT}, // 34 + {FMT_32_32_32_32, TYPE_UINT, CFMT_32_32_32_32_UINT}, // 35 + {FMT_32_32_32_32, TYPE_SINT, CFMT_32_32_32_32_SINT}, // 36 + {FMT_32_32_32_32, TYPE_FLOAT, CFMT_32_32_32_32_FLOAT}, // 37 + {FMT_5_5_5_1, TYPE_UNORM, CFMT_5_5_5_1_UNORM}, // 38 + {FMT_5_6_5, TYPE_UNORM, CFMT_5_6_5_UNORM}, // 39 + {FMT_8, TYPE_UNORM, CFMT_8_UNORM}, // 40 + {FMT_8, TYPE_SNORM, CFMT_8_SNORM}, // 41 + {FMT_8, TYPE_UINT, CFMT_8_UINT}, // 42 + {FMT_8, TYPE_SINT, CFMT_8_SINT}, // 43 + {FMT_8, TYPE_SRGB, CFMT_8_SRGB}, // 44 + {FMT_8_24, TYPE_UNORM, CFMT_8_24_UNORM}, // 45 + {FMT_8_24, TYPE_UINT, CFMT_8_24_UINT}, // 46 + {FMT_8_8, TYPE_UNORM, CFMT_8_8_UNORM}, // 47 + {FMT_8_8, TYPE_SNORM, CFMT_8_8_SNORM}, // 48 + {FMT_8_8, TYPE_UINT, CFMT_8_8_UINT}, // 49 + {FMT_8_8, TYPE_SINT, CFMT_8_8_SINT}, // 50 + {FMT_8_8, TYPE_SRGB, CFMT_8_8_SRGB}, // 51 + {FMT_8_8_8_8, TYPE_UNORM, CFMT_8_8_8_8_UNORM}, // 52 + {FMT_8_8_8_8, TYPE_SNORM, CFMT_8_8_8_8_SNORM}, // 53 + {FMT_8_8_8_8, TYPE_UINT, CFMT_8_8_8_8_UINT}, // 54 + {FMT_8_8_8_8, TYPE_SINT, CFMT_8_8_8_8_SINT}, // 55 + {FMT_8_8_8_8, TYPE_SRGB, CFMT_8_8_8_8_SRGB} // 56 }; static const int FormatLUTSize = sizeof(FormatLUT)/sizeof(formatconverstion_t); diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/resource_gfx11.h b/projects/rocr-runtime/runtime/hsa-runtime/image/resource_gfx11.h old mode 100755 new mode 100644 index 658dbdb460..158b55b855 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/resource_gfx11.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/resource_gfx11.h @@ -639,51 +639,6 @@ FMT_8_24 = 0x00000014, FMT_24_8 = 0x00000015, FMT_X24_8_32 = 0x00000016, FMT_RESERVED_155 = 0x00000017, -FMT_1 = 0x00000018, -FMT_1_REVERSED = 0x00000019, -FMT_GB_GR = 0x0000001a, -FMT_BG_RG = 0x0000001b, -FMT_4_4 = 0x0000001c, -FMT_BC1 = 0x0000001d, -FMT_BC2 = 0x0000001e, -FMT_BC3 = 0x0000001f, -FMT_BC4 = 0x00000020, -FMT_BC5 = 0x00000021, -FMT_BC6 = 0x00000022, -FMT_BC7 = 0x00000023, -FMT_6E4 = 0x00000024, -FMT_5_9_9_9 = 0x00000025, -FMT_FMASK8_S2 = 0x00000026, -FMT_FMASK8_S4 = 0x00000027, -FMT_FMASK8_S8 = 0x00000028, -FMT_FMASK16_S16 = 0x00000029, -FMT_FMASK16_S8 = 0x0000002a, -FMT_FMASK32_S16 = 0x0000002b, -FMT_FMASK32_S8 = 0x0000002c, -FMT_FMASK64_S16 = 0x0000002d, -FMT_ETC2_RGB = 0x0000002e, -FMT_ETC2_RGBA = 0x0000002f, -FMT_ETC2_R = 0x00000030, -FMT_ETC2_RG = 0x00000031, -FMT_ETC2_RGBA1 = 0x00000032, -FMT_ASTC_2D_LDR = 0x00000033, -FMT_ASTC_2D_HDR = 0x00000034, -FMT_ASTC_2D_LDR_SRGB = 0x00000035, -FMT_ASTC_3D_LDR = 0x00000036, -FMT_ASTC_3D_HDR = 0x00000037, -FMT_ASTC_3D_LDR_SRGB = 0x00000038, -FMT_MM_8 = 0x00000039, -FMT_MM_8_8 = 0x0000003a, -FMT_MM_8_8_8_8 = 0x0000003b, -FMT_MM_VYUY8 = 0x0000003c, -FMT_MM_10_11_11 = 0x0000003d, -FMT_MM_2_10_10_10 = 0x0000003e, -FMT_MM_16_16_16_16 = 0x0000003f, -FMT_10_IN_16 = 0x00000040, -FMT_10_IN_16_16 = 0x00000041, -FMT_10_IN_16_16_16_16 = 0x00000042, -FMT_7E3 = 0x00000043, -FMT_YCBCR = 0x00000044, } FMT; typedef enum type { @@ -693,74 +648,98 @@ TYPE_USCALED = 0x00000002, TYPE_SSCALED = 0x00000003, TYPE_UINT = 0x00000004, TYPE_SINT = 0x00000005, -TYPE_RESERVED_6 = 0x00000006, +TYPE_SRGB = 0x00000006, TYPE_FLOAT = 0x00000007, TYPE_RESERVED_8 = 0x00000008, -TYPE_SRGB = 0x00000009, +TYPE_RESERVED_9 = 0x00000009, TYPE_UNORM_UINT = 0x0000000a, TYPE_REVERSED_UNORM = 0x0000000b, TYPE_FLOAT_CLAMP = 0x0000000c, } type; enum FORMAT { -CFMT_INVALID = 0, -CFMT_8_UNORM = 1, -CFMT_8_SNORM = 2, -CFMT_8_UINT = 5, -CFMT_8_SINT = 6, -CFMT_16_UNORM = 7, -CFMT_16_SNORM = 8, -CFMT_16_UINT = 11, -CFMT_16_SINT = 12, -CFMT_16_FLOAT = 13, -CFMT_8_8_UNORM = 14, -CFMT_8_8_SNORM = 15, -CFMT_8_8_UINT = 18, -CFMT_8_8_SINT = 19, -CFMT_32_UINT = 20, -CFMT_32_SINT = 21, -CFMT_32_FLOAT = 22, -CFMT_16_16_UNORM = 23, -CFMT_16_16_SNORM = 24, -CFMT_16_16_UINT = 27, -CFMT_16_16_SINT = 28, -CFMT_16_16_FLOAT = 29, -CFMT_10_10_10_2_UNORM = 44, -CFMT_10_10_10_2_SNORM = 45, -CFMT_10_10_10_2_UINT = 48, -CFMT_10_10_10_2_SINT = 49, -CFMT_2_10_10_10_UNORM = 50, -CFMT_2_10_10_10_SNORM = 51, -CFMT_2_10_10_10_UINT = 54, -CFMT_2_10_10_10_SINT = 55, -CFMT_8_8_8_8_UNORM = 56, -CFMT_8_8_8_8_SNORM = 57, -CFMT_8_8_8_8_UINT = 60, -CFMT_8_8_8_8_SINT = 61, -CFMT_32_32_UINT = 62, -CFMT_32_32_SINT = 63, -CFMT_32_32_FLOAT = 64, -CFMT_16_16_16_16_UNORM = 65, -CFMT_16_16_16_16_SNORM = 66, -CFMT_16_16_16_16_UINT = 69, -CFMT_16_16_16_16_SINT = 70, -CFMT_16_16_16_16_FLOAT = 71, -CFMT_32_32_32_UINT = 72, -CFMT_32_32_32_SINT = 73, -CFMT_32_32_32_FLOAT = 74, -CFMT_32_32_32_32_UINT = 75, -CFMT_32_32_32_32_SINT = 76, -CFMT_32_32_32_32_FLOAT = 77, -CFMT_8_SRGB = 128, -CFMT_8_8_SRGB = 129, -CFMT_8_8_8_8_SRGB = 130, -CFMT_5_6_5_UNORM = 133, -CFMT_1_5_5_5_UNORM = 134, -CFMT_5_5_5_1_UNORM = 135, -CFMT_8_24_UNORM = 141, -CFMT_8_24_UINT = 142, -CFMT_24_8_UNORM = 143, -CFMT_24_8_UINT = 144 +CFMT_INVALID = 0, +CFMT_8_UNORM = 1, +CFMT_8_SNORM = 2, +CFMT_8_USCALED = 3, +CFMT_8_SSCALED = 4, +CFMT_8_UINT = 5, +CFMT_8_SINT = 6, +CFMT_16_UNORM = 7, +CFMT_16_SNORM = 8, +CFMT_16_USCALED = 9, +CFMT_16_SSCALED = 10, +CFMT_16_UINT = 11, +CFMT_16_SINT = 12, +CFMT_16_FLOAT = 13, +CFMT_8_8_UNORM = 14, +CFMT_8_8_SNORM = 15, +CFMT_8_8_USCALED = 16, +CFMT_8_8_SSCALED = 17, +CFMT_8_8_UINT = 18, +CFMT_8_8_SINT = 19, +CFMT_32_UINT = 20, +CFMT_32_SINT = 21, +CFMT_32_FLOAT = 22, +CFMT_16_16_UNORM = 23, +CFMT_16_16_SNORM = 24, +CFMT_16_16_USCALED = 25, +CFMT_16_16_SSCALED = 26, +CFMT_16_16_UINT = 27, +CFMT_16_16_SINT = 28, +CFMT_16_16_FLOAT = 29, +CFMT_10_11_11_FLOAT = 30, +CFMT_11_11_10_FLOAT = 31, +CFMT_10_10_10_2_UNORM = 32, +CFMT_10_10_10_2_SNORM = 33, +CFMT_10_10_10_2_UINT = 34, +CFMT_10_10_10_2_SINT = 35, +CFMT_2_10_10_10_UNORM = 36, +CFMT_2_10_10_10_SNORM = 37, +CFMT_2_10_10_10_USCALED = 38, +CFMT_2_10_10_10_SSCALED = 39, +CFMT_2_10_10_10_UINT = 40, +CFMT_2_10_10_10_SINT = 41, +CFMT_8_8_8_8_UNORM = 42, +CFMT_8_8_8_8_SNORM = 43, +CFMT_8_8_8_8_USCALED = 44, +CFMT_8_8_8_8_SSCALED = 45, +CFMT_8_8_8_8_UINT = 46, +CFMT_8_8_8_8_SINT = 47, +CFMT_32_32_UINT = 48, +CFMT_32_32_SINT = 49, +CFMT_32_32_FLOAT = 50, +CFMT_16_16_16_16_UNORM = 51, +CFMT_16_16_16_16_SNORM = 52, +CFMT_16_16_16_16_USCALED = 53, +CFMT_16_16_16_16_SSCALED = 54, +CFMT_16_16_16_16_UINT = 55, +CFMT_16_16_16_16_SINT = 56, +CFMT_16_16_16_16_FLOAT = 57, +CFMT_32_32_32_UINT = 58, +CFMT_32_32_32_SINT = 59, +CFMT_32_32_32_FLOAT = 60, +CFMT_32_32_32_32_UINT = 61, +CFMT_32_32_32_32_SINT = 62, +CFMT_32_32_32_32_FLOAT = 63, +CFMT_8_SRGB = 64, +CFMT_8_8_SRGB = 65, +CFMT_8_8_8_8_SRGB = 66, +CFMT_5_9_9_9_FLOAT = 67, +CFMT_5_6_5_UNORM = 68, +CFMT_1_5_5_5_UNORM = 69, +CFMT_5_5_5_1_UNORM = 70, +CFMT_4_4_4_4_UNORM = 71, +CFMT_4_4_UNORM = 72, +CFMT_1_UNORM = 73, +CFMT_1_REVERSED_UNORM = 74, +CFMT_32_FLOAT_CLAMP = 75, +CFMT_8_24_UNORM = 76, +CFMT_8_24_UINT = 77, +CFMT_24_8_UNORM = 78, +CFMT_24_8_UINT = 79, +CFMT_X24_8_32_UINT = 80, +CFMT_X24_8_32_FLOAT = 81, }; typedef enum SEL {