diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
| commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
| tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /intern/cycles/device/device_cuda.cpp | |
| parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
| parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 209fe84b789..c9ec1cc1219 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1072,6 +1072,7 @@ public: CUarray_format_enum format; switch(mem.data_type) { case TYPE_UCHAR: format = CU_AD_FORMAT_UNSIGNED_INT8; break; + case TYPE_UINT16: format = CU_AD_FORMAT_UNSIGNED_INT16; break; case TYPE_UINT: format = CU_AD_FORMAT_UNSIGNED_INT32; break; case TYPE_INT: format = CU_AD_FORMAT_SIGNED_INT32; break; case TYPE_FLOAT: format = CU_AD_FORMAT_FLOAT; break; |