diff options
Diffstat (limited to 'intern/cycles/util/util_texture.h')
| -rw-r--r-- | intern/cycles/util/util_texture.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index 233cfe33305..5ce16e0095a 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -34,29 +34,29 @@ CCL_NAMESPACE_BEGIN /* Interpolation types for textures * cuda also use texture space to store other objects */ typedef enum InterpolationType { - INTERPOLATION_NONE = -1, - INTERPOLATION_LINEAR = 0, - INTERPOLATION_CLOSEST = 1, - INTERPOLATION_CUBIC = 2, - INTERPOLATION_SMART = 3, + INTERPOLATION_NONE = -1, + INTERPOLATION_LINEAR = 0, + INTERPOLATION_CLOSEST = 1, + INTERPOLATION_CUBIC = 2, + INTERPOLATION_SMART = 3, - INTERPOLATION_NUM_TYPES, + INTERPOLATION_NUM_TYPES, } InterpolationType; /* Texture types * Since we store the type in the lower bits of a flat index, * the shift and bit mask constant below need to be kept in sync. */ typedef enum ImageDataType { - IMAGE_DATA_TYPE_FLOAT4 = 0, - IMAGE_DATA_TYPE_BYTE4 = 1, - IMAGE_DATA_TYPE_HALF4 = 2, - IMAGE_DATA_TYPE_FLOAT = 3, - IMAGE_DATA_TYPE_BYTE = 4, - IMAGE_DATA_TYPE_HALF = 5, - IMAGE_DATA_TYPE_USHORT4 = 6, - IMAGE_DATA_TYPE_USHORT = 7, + IMAGE_DATA_TYPE_FLOAT4 = 0, + IMAGE_DATA_TYPE_BYTE4 = 1, + IMAGE_DATA_TYPE_HALF4 = 2, + IMAGE_DATA_TYPE_FLOAT = 3, + IMAGE_DATA_TYPE_BYTE = 4, + IMAGE_DATA_TYPE_HALF = 5, + IMAGE_DATA_TYPE_USHORT4 = 6, + IMAGE_DATA_TYPE_USHORT = 7, - IMAGE_DATA_NUM_TYPES + IMAGE_DATA_NUM_TYPES } ImageDataType; #define IMAGE_DATA_TYPE_SHIFT 3 @@ -66,27 +66,27 @@ typedef enum ImageDataType { * * Defines how the image is extrapolated past its original bounds. */ typedef enum ExtensionType { - /* Cause the image to repeat horizontally and vertically. */ - EXTENSION_REPEAT = 0, - /* Extend by repeating edge pixels of the image. */ - EXTENSION_EXTEND = 1, - /* Clip to image size and set exterior pixels as transparent. */ - EXTENSION_CLIP = 2, + /* Cause the image to repeat horizontally and vertically. */ + EXTENSION_REPEAT = 0, + /* Extend by repeating edge pixels of the image. */ + EXTENSION_EXTEND = 1, + /* Clip to image size and set exterior pixels as transparent. */ + EXTENSION_CLIP = 2, - EXTENSION_NUM_TYPES, + EXTENSION_NUM_TYPES, } ExtensionType; typedef struct TextureInfo { - /* Pointer, offset or texture depending on device. */ - uint64_t data; - /* Buffer number for OpenCL. */ - uint cl_buffer; - /* Interpolation and extension type. */ - uint interpolation, extension; - /* Dimensions. */ - uint width, height, depth; + /* Pointer, offset or texture depending on device. */ + uint64_t data; + /* Buffer number for OpenCL. */ + uint cl_buffer; + /* Interpolation and extension type. */ + uint interpolation, extension; + /* Dimensions. */ + uint width, height, depth; } TextureInfo; CCL_NAMESPACE_END -#endif /* __UTIL_TEXTURE_H__ */ +#endif /* __UTIL_TEXTURE_H__ */ |