diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 13:05:52 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 13:05:52 +0400 |
| commit | ed3fd722108ea4d41167c8339a97ecd818e78cdf (patch) | |
| tree | 858b8ce14f808667e81bd1b1cab8d02d3415abd9 /source/blender/imbuf/intern/dds/BlockDXT.h | |
| parent | aaa93c58b367e65bf4124e4b0d380925b0a6f539 (diff) | |
Apply second half of [#21590] .dds textures: fix for DXT1n format + sync with upstream nvtt
submitted by Amorilia
This updates the DDS module with upstearm nvtt (r1042).
Diffstat (limited to 'source/blender/imbuf/intern/dds/BlockDXT.h')
| -rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index 6e9e555d963..aa0c1c509ca 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -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(); |