diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-08 03:36:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-08 03:55:44 +0300 |
| commit | f61c340bc15ef1573dc48f65fc7c71fce0a47a07 (patch) | |
| tree | e528f0faafd466a780471ae5b8029e9f102128f3 /intern/cycles/util | |
| parent | c040dedc124a413c13c62677f7d6aee0fd15668f (diff) | |
Cycles: OpenCL bicubic and tricubic texture interpolation support.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_texture.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index f22948d9bcd..cec03dc5e6e 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -52,7 +52,7 @@ CCL_NAMESPACE_BEGIN /* Interpolation types for textures * cuda also use texture space to store other objects */ -enum InterpolationType { +typedef enum InterpolationType { INTERPOLATION_NONE = -1, INTERPOLATION_LINEAR = 0, INTERPOLATION_CLOSEST = 1, @@ -60,12 +60,12 @@ enum InterpolationType { INTERPOLATION_SMART = 3, 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. */ -enum ImageDataType { +typedef enum ImageDataType { IMAGE_DATA_TYPE_FLOAT4 = 0, IMAGE_DATA_TYPE_BYTE4 = 1, IMAGE_DATA_TYPE_HALF4 = 2, @@ -74,7 +74,7 @@ enum ImageDataType { IMAGE_DATA_TYPE_HALF = 5, IMAGE_DATA_NUM_TYPES -}; +} ImageDataType; #define IMAGE_DATA_TYPE_SHIFT 3 #define IMAGE_DATA_TYPE_MASK 0x7 @@ -82,7 +82,7 @@ enum ImageDataType { /* Extension types for textures. * * Defines how the image is extrapolated past its original bounds. */ -enum ExtensionType { +typedef enum ExtensionType { /* Cause the image to repeat horizontally and vertically. */ EXTENSION_REPEAT = 0, /* Extend by repeating edge pixels of the image. */ @@ -91,7 +91,7 @@ enum ExtensionType { EXTENSION_CLIP = 2, EXTENSION_NUM_TYPES, -}; +} ExtensionType; typedef struct TextureInfo { /* Pointer, offset or texture depending on device. */ |