Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: f95945af5a
Branches Tags
godot
/
thirdparty
/
etcpak
/
patches
/
llvm-c++11-narrowing-errors.patch

llvm-c++11-narrowing-errors.patch 4.4 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 
  1. diff --git a/thirdparty/etcpak/BlockData.cpp b/thirdparty/etcpak/BlockData.cpp
    2. 

  2. index bd738085f3..395b55246b 100644
    3. 

  3. --- a/thirdparty/etcpak/BlockData.cpp
    4. 

  4. +++ b/thirdparty/etcpak/BlockData.cpp
    5. 

  5. @@ -334,10 +334,10 @@ static etcpak_force_inline void DecodeT( uint64_t block, uint32_t* dst, uint32_t
    6. 

  6.      const auto c3b = clampu8( cb1 - table59T58H[codeword] );
    7. 

  7.  
    8. 

  8.      const uint32_t col_tab[4] = {
    9. 

  9. -        cr0 | ( cg0 << 8 ) | ( cb0 << 16 ) | 0xFF000000,
    10. 

  10. -        c2r | ( c2g << 8 ) | ( c2b << 16 ) | 0xFF000000,
    11. 

  11. -        cr1 | ( cg1 << 8 ) | ( cb1 << 16 ) | 0xFF000000,
    12. 

  12. -        c3r | ( c3g << 8 ) | ( c3b << 16 ) | 0xFF000000
    13. 

  13. +        uint32_t(cr0 | ( cg0 << 8 ) | ( cb0 << 16 ) | 0xFF000000),
    14. 

  14. +        uint32_t(c2r | ( c2g << 8 ) | ( c2b << 16 ) | 0xFF000000),
    15. 

  15. +        uint32_t(cr1 | ( cg1 << 8 ) | ( cb1 << 16 ) | 0xFF000000),
    16. 

  16. +        uint32_t(c3r | ( c3g << 8 ) | ( c3b << 16 ) | 0xFF000000)
    17. 

  17.      };
    18. 

  18.  
    19. 

  19.      const uint32_t indexes = ( block >> 32 ) & 0xFFFFFFFF;
    20. 

  20. @@ -389,10 +389,10 @@ static etcpak_force_inline void DecodeTAlpha( uint64_t block, uint64_t alpha, ui
    21. 

  21.      const auto c3b = clampu8( cb1 - table59T58H[codeword] );
    22. 

  22.  
    23. 

  23.      const uint32_t col_tab[4] = {
    24. 

  24. -        cr0 | ( cg0 << 8 ) | ( cb0 << 16 ),
    25. 

  25. -        c2r | ( c2g << 8 ) | ( c2b << 16 ),
    26. 

  26. -        cr1 | ( cg1 << 8 ) | ( cb1 << 16 ),
    27. 

  27. -        c3r | ( c3g << 8 ) | ( c3b << 16 )
    28. 

  28. +        uint32_t(cr0 | ( cg0 << 8 ) | ( cb0 << 16 )),
    29. 

  29. +        uint32_t(c2r | ( c2g << 8 ) | ( c2b << 16 )),
    30. 

  30. +        uint32_t(cr1 | ( cg1 << 8 ) | ( cb1 << 16 )),
    31. 

  31. +        uint32_t(c3r | ( c3g << 8 ) | ( c3b << 16 ))
    32. 

  32.      };
    33. 

  33.  
    34. 

  34.      const uint32_t indexes = ( block >> 32 ) & 0xFFFFFFFF;
    35. 

  35. @@ -436,10 +436,10 @@ static etcpak_force_inline void DecodeH( uint64_t block, uint32_t* dst, uint32_t
    36. 

  36.      const auto codeword = codeword_hi | codeword_lo;
    37. 

  37.  
    38. 

  38.      const uint32_t col_tab[] = {
    39. 

  39. -        clampu8( r0 + table59T58H[codeword] ) | ( clampu8( g0 + table59T58H[codeword] ) << 8 ) | ( clampu8( b0 + table59T58H[codeword] ) << 16 ),
    40. 

  40. -        clampu8( r0 - table59T58H[codeword] ) | ( clampu8( g0 - table59T58H[codeword] ) << 8 ) | ( clampu8( b0 - table59T58H[codeword] ) << 16 ),
    41. 

  41. -        clampu8( r1 + table59T58H[codeword] ) | ( clampu8( g1 + table59T58H[codeword] ) << 8 ) | ( clampu8( b1 + table59T58H[codeword] ) << 16 ),
    42. 

  42. -        clampu8( r1 - table59T58H[codeword] ) | ( clampu8( g1 - table59T58H[codeword] ) << 8 ) | ( clampu8( b1 - table59T58H[codeword] ) << 16 )
    43. 

  43. +        uint32_t(clampu8( r0 + table59T58H[codeword] ) | ( clampu8( g0 + table59T58H[codeword] ) << 8 ) | ( clampu8( b0 + table59T58H[codeword] ) << 16 )),
    44. 

  44. +        uint32_t(clampu8( r0 - table59T58H[codeword] ) | ( clampu8( g0 - table59T58H[codeword] ) << 8 ) | ( clampu8( b0 - table59T58H[codeword] ) << 16 )),
    45. 

  45. +        uint32_t(clampu8( r1 + table59T58H[codeword] ) | ( clampu8( g1 + table59T58H[codeword] ) << 8 ) | ( clampu8( b1 + table59T58H[codeword] ) << 16 )),
    46. 

  46. +        uint32_t(clampu8( r1 - table59T58H[codeword] ) | ( clampu8( g1 - table59T58H[codeword] ) << 8 ) | ( clampu8( b1 - table59T58H[codeword] ) << 16 ))
    47. 

  47.      };
    48. 

  48.  
    49. 

  49.      for( uint8_t j = 0; j < 4; j++ )
    50. 

  50. @@ -483,10 +483,10 @@ static etcpak_force_inline void DecodeHAlpha( uint64_t block, uint64_t alpha, ui
    51. 

  51.      const auto tbl = g_alpha[(alpha >> 48) & 0xF];
    52. 

  52.  
    53. 

  53.      const uint32_t col_tab[] = {
    54. 

  54. -        clampu8( r0 + table59T58H[codeword] ) | ( clampu8( g0 + table59T58H[codeword] ) << 8 ) | ( clampu8( b0 + table59T58H[codeword] ) << 16 ),
    55. 

  55. -        clampu8( r0 - table59T58H[codeword] ) | ( clampu8( g0 - table59T58H[codeword] ) << 8 ) | ( clampu8( b0 - table59T58H[codeword] ) << 16 ),
    56. 

  56. -        clampu8( r1 + table59T58H[codeword] ) | ( clampu8( g1 + table59T58H[codeword] ) << 8 ) | ( clampu8( b1 + table59T58H[codeword] ) << 16 ),
    57. 

  57. -        clampu8( r1 - table59T58H[codeword] ) | ( clampu8( g1 - table59T58H[codeword] ) << 8 ) | ( clampu8( b1 - table59T58H[codeword] ) << 16 )
    58. 

  58. +        uint32_t(clampu8( r0 + table59T58H[codeword] ) | ( clampu8( g0 + table59T58H[codeword] ) << 8 ) | ( clampu8( b0 + table59T58H[codeword] ) << 16 )),
    59. 

  59. +        uint32_t(clampu8( r0 - table59T58H[codeword] ) | ( clampu8( g0 - table59T58H[codeword] ) << 8 ) | ( clampu8( b0 - table59T58H[codeword] ) << 16 )),
    60. 

  60. +        uint32_t(clampu8( r1 + table59T58H[codeword] ) | ( clampu8( g1 + table59T58H[codeword] ) << 8 ) | ( clampu8( b1 + table59T58H[codeword] ) << 16 )),
    61. 

  61. +        uint32_t(clampu8( r1 - table59T58H[codeword] ) | ( clampu8( g1 - table59T58H[codeword] ) << 8 ) | ( clampu8( b1 - table59T58H[codeword] ) << 16 ))
    62. 

  62.      };
    63. 

  63.  
    64. 

  64.      for( uint8_t j = 0; j < 4; j++ )
    65.