홈 탐색 도움말
로그인
godotengine
/
godot
의 미러 https://github.com/godotengine/godot/
Watch 1
Star 7
포크 0
파일 이슈 1
트리: 38775731e8
브랜치 태그
godot
/
thirdparty
/
cvtt
/
patches
/
revert_BC6H_reorg.patch

revert_BC6H_reorg.patch 22 KB
히스토리 Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394 
  1. diff --git a/thirdparty/cvtt/ConvectionKernels_BC67.cpp b/thirdparty/cvtt/ConvectionKernels_BC67.cpp
    2. 

  2. index 021d658c08..011f51570b 100644
    3. 

  3. --- a/thirdparty/cvtt/ConvectionKernels_BC67.cpp
    4. 

  4. +++ b/thirdparty/cvtt/ConvectionKernels_BC67.cpp
    5. 

  5. @@ -76,6 +76,205 @@ namespace cvtt
    6. 

  6.              };
    7. 

  7.          }
    8. 

  8.  
    9. 

  9. +        namespace BC6HData
    10. 

  10. +        {
    11. 

  11. +            enum EField
    12. 

  12. +            {
    13. 

  13. +                NA, // N/A
    14. 

  14. +                M,  // Mode
    15. 

  15. +                D,  // Shape
    16. 

  16. +                RW,
    17. 

  17. +                RX,
    18. 

  18. +                RY,
    19. 

  19. +                RZ,
    20. 

  20. +                GW,
    21. 

  21. +                GX,
    22. 

  22. +                GY,
    23. 

  23. +                GZ,
    24. 

  24. +                BW,
    25. 

  25. +                BX,
    26. 

  26. +                BY,
    27. 

  27. +                BZ,
    28. 

  28. +            };
    29. 

  29. +
    30. 

  30. +            struct ModeDescriptor
    31. 

  31. +            {
    32. 

  32. +                EField m_eField;
    33. 

  33. +                uint8_t   m_uBit;
    34. 

  34. +            };
    35. 

  35. +
    36. 

  36. +            const ModeDescriptor g_modeDescriptors[14][82] =
    37. 

  37. +            {
    38. 

  38. +                {   // Mode 1 (0x00) - 10 5 5 5
    39. 

  39. +                    { M, 0 },{ M, 1 },{ GY, 4 },{ BY, 4 },{ BZ, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    40. 

  40. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    41. 

  41. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    42. 

  42. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    43. 

  43. +                    { GZ, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    44. 

  44. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    45. 

  45. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    46. 

  46. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    47. 

  47. +                    { D, 3 },{ D, 4 },
    48. 

  48. +                },
    49. 

  49. +
    50. 

  50. +                {   // Mode 2 (0x01) - 7 6 6 6
    51. 

  51. +                    { M, 0 },{ M, 1 },{ GY, 5 },{ GZ, 4 },{ GZ, 5 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    52. 

  52. +                    { RW, 5 },{ RW, 6 },{ BZ, 0 },{ BZ, 1 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    53. 

  53. +                    { GW, 5 },{ GW, 6 },{ BY, 5 },{ BZ, 2 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    54. 

  54. +                    { BW, 5 },{ BW, 6 },{ BZ, 3 },{ BZ, 5 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    55. 

  55. +                    { RX, 5 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    56. 

  56. +                    { GX, 5 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    57. 

  57. +                    { BX, 5 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    58. 

  58. +                    { RY, 5 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ RZ, 5 },{ D, 0 },{ D, 1 },{ D, 2 },
    59. 

  59. +                    { D, 3 },{ D, 4 },
    60. 

  60. +                },
    61. 

  61. +
    62. 

  62. +                {   // Mode 3 (0x02) - 11 5 4 4
    63. 

  63. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    64. 

  64. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    65. 

  65. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    66. 

  66. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    67. 

  67. +                    { RW,10 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GW,10 },
    68. 

  68. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BW,10 },
    69. 

  69. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    70. 

  70. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    71. 

  71. +                    { D, 3 },{ D, 4 },
    72. 

  72. +                },
    73. 

  73. +
    74. 

  74. +                {   // Mode 4 (0x06) - 11 4 5 4
    75. 

  75. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    76. 

  76. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    77. 

  77. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    78. 

  78. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RW,10 },
    79. 

  79. +                    { GZ, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    80. 

  80. +                    { GW,10 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BW,10 },
    81. 

  81. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ BZ, 0 },
    82. 

  82. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ GY, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    83. 

  83. +                    { D, 3 },{ D, 4 },
    84. 

  84. +                },
    85. 

  85. +
    86. 

  86. +                {   // Mode 5 (0x0a) - 11 4 4 5
    87. 

  87. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    88. 

  88. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    89. 

  89. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    90. 

  90. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RW,10 },
    91. 

  91. +                    { BY, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GW,10 },
    92. 

  92. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    93. 

  93. +                    { BW,10 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ BZ, 1 },
    94. 

  94. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ BZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    95. 

  95. +                    { D, 3 },{ D, 4 },
    96. 

  96. +                },
    97. 

  97. +
    98. 

  98. +                {   // Mode 6 (0x0e) - 9 5 5 5
    99. 

  99. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    100. 

  100. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    101. 

  101. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    102. 

  102. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    103. 

  103. +                    { GZ, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    104. 

  104. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    105. 

  105. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    106. 

  106. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    107. 

  107. +                    { D, 3 },{ D, 4 },
    108. 

  108. +                },
    109. 

  109. +
    110. 

  110. +                {   // Mode 7 (0x12) - 8 6 5 5
    111. 

  111. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    112. 

  112. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ GZ, 4 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    113. 

  113. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ BZ, 2 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    114. 

  114. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BZ, 3 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    115. 

  115. +                    { RX, 5 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    116. 

  116. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    117. 

  117. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    118. 

  118. +                    { RY, 5 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ RZ, 5 },{ D, 0 },{ D, 1 },{ D, 2 },
    119. 

  119. +                    { D, 3 },{ D, 4 },
    120. 

  120. +                },
    121. 

  121. +
    122. 

  122. +                {   // Mode 8 (0x16) - 8 5 6 5
    123. 

  123. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    124. 

  124. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ BZ, 0 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    125. 

  125. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GY, 5 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    126. 

  126. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ GZ, 5 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    127. 

  127. +                    { GZ, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    128. 

  128. +                    { GX, 5 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    129. 

  129. +                    { BZ, 1 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    130. 

  130. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    131. 

  131. +                    { D, 3 },{ D, 4 },
    132. 

  132. +                },
    133. 

  133. +
    134. 

  134. +                {   // Mode 9 (0x1a) - 8 5 5 6
    135. 

  135. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    136. 

  136. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ BZ, 1 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    137. 

  137. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ BY, 5 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    138. 

  138. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BZ, 5 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    139. 

  139. +                    { GZ, 4 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    140. 

  140. +                    { BZ, 0 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    141. 

  141. +                    { BX, 5 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    142. 

  142. +                    { BZ, 2 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ BZ, 3 },{ D, 0 },{ D, 1 },{ D, 2 },
    143. 

  143. +                    { D, 3 },{ D, 4 },
    144. 

  144. +                },
    145. 

  145. +
    146. 

  146. +                {   // Mode 10 (0x1e) - 6 6 6 6
    147. 

  147. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    148. 

  148. +                    { RW, 5 },{ GZ, 4 },{ BZ, 0 },{ BZ, 1 },{ BY, 4 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    149. 

  149. +                    { GW, 5 },{ GY, 5 },{ BY, 5 },{ BZ, 2 },{ GY, 4 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    150. 

  150. +                    { BW, 5 },{ GZ, 5 },{ BZ, 3 },{ BZ, 5 },{ BZ, 4 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    151. 

  151. +                    { RX, 5 },{ GY, 0 },{ GY, 1 },{ GY, 2 },{ GY, 3 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    152. 

  152. +                    { GX, 5 },{ GZ, 0 },{ GZ, 1 },{ GZ, 2 },{ GZ, 3 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    153. 

  153. +                    { BX, 5 },{ BY, 0 },{ BY, 1 },{ BY, 2 },{ BY, 3 },{ RY, 0 },{ RY, 1 },{ RY, 2 },{ RY, 3 },{ RY, 4 },
    154. 

  154. +                    { RY, 5 },{ RZ, 0 },{ RZ, 1 },{ RZ, 2 },{ RZ, 3 },{ RZ, 4 },{ RZ, 5 },{ D, 0 },{ D, 1 },{ D, 2 },
    155. 

  155. +                    { D, 3 },{ D, 4 },
    156. 

  156. +                },
    157. 

  157. +
    158. 

  158. +                {   // Mode 11 (0x03) - 10 10
    159. 

  159. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    160. 

  160. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    161. 

  161. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    162. 

  162. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    163. 

  163. +                    { RX, 5 },{ RX, 6 },{ RX, 7 },{ RX, 8 },{ RX, 9 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    164. 

  164. +                    { GX, 5 },{ GX, 6 },{ GX, 7 },{ GX, 8 },{ GX, 9 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    165. 

  165. +                    { BX, 5 },{ BX, 6 },{ BX, 7 },{ BX, 8 },{ BX, 9 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    166. 

  166. +                    { NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    167. 

  167. +                    { NA, 0 },{ NA, 0 },
    168. 

  168. +                },
    169. 

  169. +
    170. 

  170. +                {   // Mode 12 (0x07) - 11 9
    171. 

  171. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    172. 

  172. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    173. 

  173. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    174. 

  174. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    175. 

  175. +                    { RX, 5 },{ RX, 6 },{ RX, 7 },{ RX, 8 },{ RW,10 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    176. 

  176. +                    { GX, 5 },{ GX, 6 },{ GX, 7 },{ GX, 8 },{ GW,10 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    177. 

  177. +                    { BX, 5 },{ BX, 6 },{ BX, 7 },{ BX, 8 },{ BW,10 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    178. 

  178. +                    { NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    179. 

  179. +                    { NA, 0 },{ NA, 0 },
    180. 

  180. +                },
    181. 

  181. +
    182. 

  182. +                {   // Mode 13 (0x0b) - 12 8
    183. 

  183. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    184. 

  184. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    185. 

  185. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    186. 

  186. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RX, 4 },
    187. 

  187. +                    { RX, 5 },{ RX, 6 },{ RX, 7 },{ RW,11 },{ RW,10 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GX, 4 },
    188. 

  188. +                    { GX, 5 },{ GX, 6 },{ GX, 7 },{ GW,11 },{ GW,10 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BX, 4 },
    189. 

  189. +                    { BX, 5 },{ BX, 6 },{ BX, 7 },{ BW,11 },{ BW,10 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    190. 

  190. +                    { NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    191. 

  191. +                    { NA, 0 },{ NA, 0 },
    192. 

  192. +                },
    193. 

  193. +
    194. 

  194. +                {   // Mode 14 (0x0f) - 16 4
    195. 

  195. +                    { M, 0 },{ M, 1 },{ M, 2 },{ M, 3 },{ M, 4 },{ RW, 0 },{ RW, 1 },{ RW, 2 },{ RW, 3 },{ RW, 4 },
    196. 

  196. +                    { RW, 5 },{ RW, 6 },{ RW, 7 },{ RW, 8 },{ RW, 9 },{ GW, 0 },{ GW, 1 },{ GW, 2 },{ GW, 3 },{ GW, 4 },
    197. 

  197. +                    { GW, 5 },{ GW, 6 },{ GW, 7 },{ GW, 8 },{ GW, 9 },{ BW, 0 },{ BW, 1 },{ BW, 2 },{ BW, 3 },{ BW, 4 },
    198. 

  198. +                    { BW, 5 },{ BW, 6 },{ BW, 7 },{ BW, 8 },{ BW, 9 },{ RX, 0 },{ RX, 1 },{ RX, 2 },{ RX, 3 },{ RW,15 },
    199. 

  199. +                    { RW,14 },{ RW,13 },{ RW,12 },{ RW,11 },{ RW,10 },{ GX, 0 },{ GX, 1 },{ GX, 2 },{ GX, 3 },{ GW,15 },
    200. 

  200. +                    { GW,14 },{ GW,13 },{ GW,12 },{ GW,11 },{ GW,10 },{ BX, 0 },{ BX, 1 },{ BX, 2 },{ BX, 3 },{ BW,15 },
    201. 

  201. +                    { BW,14 },{ BW,13 },{ BW,12 },{ BW,11 },{ BW,10 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    202. 

  202. +                    { NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },{ NA, 0 },
    203. 

  203. +                    { NA, 0 },{ NA, 0 },
    204. 

  204. +                },
    205. 

  205. +            };
    206. 

  206. +        }
    207. 

  207. +
    208. 

  208.          namespace BC7Data
    209. 

  209.          {
    210. 

  210.              enum AlphaMode
    211. 

  211. @@ -2998,9 +3197,9 @@ void cvtt::Internal::BC6HComputer::Pack(uint32_t flags, const PixelBlockF16* inp
    212. 

  212.  
    213. 

  213.          const BC7Data::BC6HModeInfo& modeInfo = BC7Data::g_hdrModes[mode];
    214. 

  214.  
    215. 

  215. -        BC6H_IO::WriteFunc_t writeFunc = BC6H_IO::g_writeFuncs[mode];
    216. 

  216. +        const BC6HData::ModeDescriptor *desc = BC6HData::g_modeDescriptors[mode];
    217. 

  217.  
    218. 

  218. -        const int headerBits = modeInfo.m_partitioned ? 82 : 65;
    219. 

  219. +        const size_t headerBits = modeInfo.m_partitioned ? 82 : 65;
    220. 

  220.  
    221. 

  221.          for (int subset = 0; subset < 2; subset++)
    222. 

  222.          {
    223. 

  223. @@ -3017,16 +3216,58 @@ void cvtt::Internal::BC6HComputer::Pack(uint32_t flags, const PixelBlockF16* inp
    224. 

  224.          uint16_t modeID = modeInfo.m_modeID;
    225. 

  225.  
    226. 

  226.          PackingVector pv;
    227. 

  227. +        pv.Init();
    228. 

  228.  
    229. 

  229. -        {
    230. 

  230. -            uint32_t header[3];
    231. 

  231. -            writeFunc(header, modeID, partition,
    232. 

  232. -                eps[0][0][0], eps[0][1][0], eps[1][0][0], eps[1][1][0],
    233. 

  233. -                eps[0][0][1], eps[0][1][1], eps[1][0][1], eps[1][1][1],
    234. 

  234. -                eps[0][0][2], eps[0][1][2], eps[1][0][2], eps[1][1][2]
    235. 

  235. -            );
    236. 

  236. -
    237. 

  237. -            pv.InitPacked(header, headerBits);
    238. 

  238. +        for (size_t i = 0; i < headerBits; i++) {
    239. 

  239. +            int32_t codedValue = 0;
    240. 

  240. +            switch (desc[i].m_eField) {
    241. 

  241. +                case BC6HData::M:
    242. 

  242. +                    codedValue = modeID;
    243. 

  243. +                    break;
    244. 

  244. +                case BC6HData::D:
    245. 

  245. +                    codedValue = partition;
    246. 

  246. +                    break;
    247. 

  247. +                case BC6HData::RW:
    248. 

  248. +                    codedValue = eps[0][0][0];
    249. 

  249. +                    break;
    250. 

  250. +                case BC6HData::RX:
    251. 

  251. +                    codedValue = eps[0][1][0];
    252. 

  252. +                    break;
    253. 

  253. +                case BC6HData::RY:
    254. 

  254. +                    codedValue = eps[1][0][0];
    255. 

  255. +                    break;
    256. 

  256. +                case BC6HData::RZ:
    257. 

  257. +                    codedValue = eps[1][1][0];
    258. 

  258. +                    break;
    259. 

  259. +                case BC6HData::GW:
    260. 

  260. +                    codedValue = eps[0][0][1];
    261. 

  261. +                    break;
    262. 

  262. +                case BC6HData::GX:
    263. 

  263. +                    codedValue = eps[0][1][1];
    264. 

  264. +                    break;
    265. 

  265. +                case BC6HData::GY:
    266. 

  266. +                    codedValue = eps[1][0][1];
    267. 

  267. +                    break;
    268. 

  268. +                case BC6HData::GZ:
    269. 

  269. +                    codedValue = eps[1][1][1];
    270. 

  270. +                    break;
    271. 

  271. +                case BC6HData::BW:
    272. 

  272. +                    codedValue = eps[0][0][2];
    273. 

  273. +                    break;
    274. 

  274. +                case BC6HData::BX:
    275. 

  275. +                    codedValue = eps[0][1][2];
    276. 

  276. +                    break;
    277. 

  277. +                case BC6HData::BY:
    278. 

  278. +                    codedValue = eps[1][0][2];
    279. 

  279. +                    break;
    280. 

  280. +                case BC6HData::BZ:
    281. 

  281. +                    codedValue = eps[1][1][2];
    282. 

  282. +                    break;
    283. 

  283. +                default:
    284. 

  284. +                    assert(false);
    285. 

  285. +                    break;
    286. 

  286. +            }
    287. 

  287. +            pv.Pack(static_cast<uint16_t>((codedValue >> desc[i].m_uBit) & 1), 1);
    288. 

  288.          }
    289. 

  289.  
    290. 

  290.          int fixupIndex1 = 0;
    291. 

  291. @@ -3058,11 +3299,14 @@ void cvtt::Internal::BC6HComputer::SignExtendSingle(int &v, int bits)
    292. 

  292.  
    293. 

  293.  void cvtt::Internal::BC6HComputer::UnpackOne(PixelBlockF16 &output, const uint8_t *pBC, bool isSigned)
    294. 

  294.  {
    295. 

  295. +    UnpackingVector pv;
    296. 

  296. +    pv.Init(pBC);
    297. 

  297. +
    298. 

  298.      int numModeBits = 2;
    299. 

  299. -    int modeBits = pBC[0] & 0x3;
    300. 

  300. +    int modeBits = pv.Unpack(2);
    301. 

  301.      if (modeBits != 0 && modeBits != 1)
    302. 

  302.      {
    303. 

  303. -        modeBits = pBC[0] & 0x1f;
    304. 

  304. +        modeBits |= pv.Unpack(3) << 2;
    305. 

  305.          numModeBits += 3;
    306. 

  306.      }
    307. 

  307.  
    308. 

  308. @@ -3088,10 +3332,10 @@ void cvtt::Internal::BC6HComputer::UnpackOne(PixelBlockF16 &output, const uint8_
    309. 

  309.      }
    310. 

  310.  
    311. 

  311.      const BC7Data::BC6HModeInfo& modeInfo = BC7Data::g_hdrModes[mode];
    312. 

  312. -    const int headerBits = modeInfo.m_partitioned ? 82 : 65;
    313. 

  313. -    const BC6H_IO::ReadFunc_t readFunc = BC6H_IO::g_readFuncs[mode];
    314. 

  314. +    const size_t headerBits = modeInfo.m_partitioned ? 82 : 65;
    315. 

  315. +    const BC6HData::ModeDescriptor *desc = BC6HData::g_modeDescriptors[mode];
    316. 

  316.  
    317. 

  317. -    uint16_t partition = 0;
    318. 

  318. +    int32_t partition = 0;
    319. 

  319.      int32_t eps[2][2][3];
    320. 

  320.  
    321. 

  321.      for (int subset = 0; subset < 2; subset++)
    322. 

  322. @@ -3099,24 +3343,55 @@ void cvtt::Internal::BC6HComputer::UnpackOne(PixelBlockF16 &output, const uint8_
    323. 

  323.              for (int ch = 0; ch < 3; ch++)
    324. 

  324.                  eps[subset][epi][ch] = 0;
    325. 

  325.  
    326. 

  326. -    UnpackingVector pv;
    327. 

  327. -    pv.Init(pBC);
    328. 

  328. -
    329. 

  329. -    {
    330. 

  330. -        uint32_t header[3];
    331. 

  331. -        uint16_t codedEPs[2][2][3];
    332. 

  332. -        pv.UnpackStart(header, headerBits);
    333. 

  333. +    for (size_t i = numModeBits; i < headerBits; i++) {
    334. 

  334. +        int32_t *pCodedValue = NULL;
    335. 

  335.  
    336. 

  336. -        readFunc(header, partition,
    337. 

  337. -            codedEPs[0][0][0], codedEPs[0][1][0], codedEPs[1][0][0], codedEPs[1][1][0],
    338. 

  338. -            codedEPs[0][0][1], codedEPs[0][1][1], codedEPs[1][0][1], codedEPs[1][1][1],
    339. 

  339. -            codedEPs[0][0][2], codedEPs[0][1][2], codedEPs[1][0][2], codedEPs[1][1][2]
    340. 

  340. -        );
    341. 

  341. +        switch (desc[i].m_eField) {
    342. 

  342. +            case BC6HData::D:
    343. 

  343. +                pCodedValue = &partition;
    344. 

  344. +                break;
    345. 

  345. +            case BC6HData::RW:
    346. 

  346. +                pCodedValue = &eps[0][0][0];
    347. 

  347. +                break;
    348. 

  348. +            case BC6HData::RX:
    349. 

  349. +                pCodedValue = &eps[0][1][0];
    350. 

  350. +                break;
    351. 

  351. +            case BC6HData::RY:
    352. 

  352. +                pCodedValue = &eps[1][0][0];
    353. 

  353. +                break;
    354. 

  354. +            case BC6HData::RZ:
    355. 

  355. +                pCodedValue = &eps[1][1][0];
    356. 

  356. +                break;
    357. 

  357. +            case BC6HData::GW:
    358. 

  358. +                pCodedValue = &eps[0][0][1];
    359. 

  359. +                break;
    360. 

  360. +            case BC6HData::GX:
    361. 

  361. +                pCodedValue = &eps[0][1][1];
    362. 

  362. +                break;
    363. 

  363. +            case BC6HData::GY:
    364. 

  364. +                pCodedValue = &eps[1][0][1];
    365. 

  365. +                break;
    366. 

  366. +            case BC6HData::GZ:
    367. 

  367. +                pCodedValue = &eps[1][1][1];
    368. 

  368. +                break;
    369. 

  369. +            case BC6HData::BW:
    370. 

  370. +                pCodedValue = &eps[0][0][2];
    371. 

  371. +                break;
    372. 

  372. +            case BC6HData::BX:
    373. 

  373. +                pCodedValue = &eps[0][1][2];
    374. 

  374. +                break;
    375. 

  375. +            case BC6HData::BY:
    376. 

  376. +                pCodedValue = &eps[1][0][2];
    377. 

  377. +                break;
    378. 

  378. +            case BC6HData::BZ:
    379. 

  379. +                pCodedValue = &eps[1][1][2];
    380. 

  380. +                break;
    381. 

  381. +            default:
    382. 

  382. +                assert(false);
    383. 

  383. +                break;
    384. 

  384. +        }
    385. 

  385.  
    386. 

  386. -        for (int subset = 0; subset < 2; subset++)
    387. 

  387. -            for (int epi = 0; epi < 2; epi++)
    388. 

  388. -                for (int ch = 0; ch < 3; ch++)
    389. 

  389. -                    eps[subset][epi][ch] = codedEPs[subset][epi][ch];
    390. 

  390. +        (*pCodedValue) |= pv.Unpack(1) << desc[i].m_uBit;
    391. 

  391.      }
    392. 

  392.  
    393. 

  393.      uint16_t modeID = modeInfo.m_modeID;
    394. 

  394.