diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-08-11 23:30:03 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-08-11 23:30:03 +0300 |
| commit | 5ac7ef873b7b5895b3482387ba05168e694c6525 (patch) | |
| tree | a3447b515188600e1cccaa917aad8eaf47c6410d /intern/cycles/render/image.h | |
| parent | 3aed54dbd517f6c99b512ffa842bee75dea48fc7 (diff) | |
Cycles: Change code order for Image Data Types.
Now we have the 4 component ones first (float4, byte4, half4) followed by the 1 component ones (float, byte, half).
Makes code a bit more consistent and also reduces code a bit when enabling half support on GPU in next commit.
This also exposed a typo in half CPU images for 3D textures, which wasn't used yet, but good to have that one fixed anyway.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 07998684b23..cca71a6bb93 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -39,9 +39,9 @@ public: enum ImageDataType { IMAGE_DATA_TYPE_FLOAT4 = 0, IMAGE_DATA_TYPE_BYTE4 = 1, - IMAGE_DATA_TYPE_FLOAT = 2, - IMAGE_DATA_TYPE_BYTE = 3, - IMAGE_DATA_TYPE_HALF4 = 4, + IMAGE_DATA_TYPE_HALF4 = 2, + IMAGE_DATA_TYPE_FLOAT = 3, + IMAGE_DATA_TYPE_BYTE = 4, IMAGE_DATA_TYPE_HALF = 5, IMAGE_DATA_NUM_TYPES |