Apply second half of [#21590] .dds textures: fix for DXT1n format + sync with upstrea...
[blender.git] / source / blender / imbuf / intern / dds / BlockDXT.h
index 6e9e555d96344bcf48113dc6f9d30428e10a1397..aa0c1c509ca111090e91d067f9f2eba4e9545df5 100644 (file)
@@ -78,11 +78,13 @@ struct BlockDXT1
        bool isFourColorMode() const;
 
        uint evaluatePalette(Color32 color_array[4]) const;
-       uint evaluatePaletteFast(Color32 color_array[4]) const;
+       uint evaluatePaletteNV5x(Color32 color_array[4]) const;
+
        void evaluatePalette3(Color32 color_array[4]) const;
        void evaluatePalette4(Color32 color_array[4]) const;
        
        void decodeBlock(ColorBlock * block) const;
+       void decodeBlockNV5x(ColorBlock * block) const;
        
        void setIndices(int * idx);
 
@@ -136,6 +138,7 @@ struct BlockDXT3
        BlockDXT1 color;
        
        void decodeBlock(ColorBlock * block) const;
+       void decodeBlockNV5x(ColorBlock * block) const;
        
        void flip4();
        void flip2();
@@ -213,6 +216,7 @@ struct BlockDXT5
        BlockDXT1 color;
        
        void decodeBlock(ColorBlock * block) const;
+       void decodeBlockNV5x(ColorBlock * block) const;
        
        void flip4();
        void flip2();