nvtt.h   nvtt.h 
skipping to change at line 75 skipping to change at line 75
{ {
// No compression. // No compression.
Format_RGB, Format_RGB,
Format_RGBA = Format_RGB, Format_RGBA = Format_RGB,
// DX9 formats. // DX9 formats.
Format_DXT1, Format_DXT1,
Format_DXT1a, // DXT1 with binary alpha. Format_DXT1a, // DXT1 with binary alpha.
Format_DXT3, Format_DXT3,
Format_DXT5, Format_DXT5,
Format_DXT5n, // Compressed HILO: R=0, G=x, B=0, A=y Format_DXT5n, // Compressed HILO: R=1, G=y, B=0, A=x
// DX10 formats. // DX10 formats.
Format_BC1 = Format_DXT1, Format_BC1 = Format_DXT1,
Format_BC1a = Format_DXT1a, Format_BC1a = Format_DXT1a,
Format_BC2 = Format_DXT3, Format_BC2 = Format_DXT3,
Format_BC3 = Format_DXT5, Format_BC3 = Format_DXT5,
Format_BC3n = Format_DXT5n, Format_BC3n = Format_DXT5n,
Format_BC4, // ATI1 Format_BC4, // ATI1
Format_BC5, // 3DC, ATI2 Format_BC5, // 3DC, ATI2
}; };
skipping to change at line 195 skipping to change at line 195
// Setup input layout. // Setup input layout.
NVTT_API void setTextureLayout(TextureType type, int w, int h, int d = 1); NVTT_API void setTextureLayout(TextureType type, int w, int h, int d = 1);
NVTT_API void resetTextureLayout(); NVTT_API void resetTextureLayout();
// Set mipmap data. Copies the data. // Set mipmap data. Copies the data.
NVTT_API bool setMipmapData(const void * data, int w, int h, int d = 1, int face = 0, int mipmap = 0); NVTT_API bool setMipmapData(const void * data, int w, int h, int d = 1, int face = 0, int mipmap = 0);
// Describe the format of the input. // Describe the format of the input.
NVTT_API void setFormat(InputFormat format); NVTT_API void setFormat(InputFormat format);
// Set the way the input alpha channel is interpreted. @@ No t implemented! // Set the way the input alpha channel is interpreted.
NVTT_API void setAlphaMode(AlphaMode alphaMode); NVTT_API void setAlphaMode(AlphaMode alphaMode);
// Set gamma settings. // Set gamma settings.
NVTT_API void setGamma(float inputGamma, float outputGamma); NVTT_API void setGamma(float inputGamma, float outputGamma);
// Set texture wrappign mode. // Set texture wrappign mode.
NVTT_API void setWrapMode(WrapMode mode); NVTT_API void setWrapMode(WrapMode mode);
// Set mipmapping options. // Set mipmapping options.
NVTT_API void setMipmapFilter(MipmapFilter filter); NVTT_API void setMipmapFilter(MipmapFilter filter);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/