diff options
author | Thomas Dinges <blender@dingto.org> | 2016-04-16 00:01:20 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-04-16 00:02:44 +0300 |
commit | 9c916b0172350fa405c578db7487c49ea65c0f26 (patch) | |
tree | 87ef08dad1e8c64045be004f9251990954c7a8ad /intern/cycles/render/image.h | |
parent | 34c99fa30ade70d7677972ab18acc4c6ad52558b (diff) |
Cleanup: Move texture definitions to util, to avoid bad level include.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index c5561e16cb3..e4fb8001b78 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -24,35 +24,8 @@ #include "util_thread.h" #include "util_vector.h" -#include "kernel_types.h" /* for TEX_NUM_FLOAT_IMAGES */ - CCL_NAMESPACE_BEGIN -/* generic */ -#define TEX_NUM_IMAGES 88 -#define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES - -/* extended gpu */ -#define TEX_EXTENDED_NUM_IMAGES_GPU 145 - -/* extended cpu */ -#define TEX_EXTENDED_NUM_FLOAT_IMAGES 1024 -#define TEX_EXTENDED_NUM_IMAGES_CPU 1024 -#define TEX_EXTENDED_IMAGE_BYTE_START TEX_EXTENDED_NUM_FLOAT_IMAGES - -/* Limitations for packed images. - * - * Technically number of textures is unlimited, but it should in - * fact be in sync with CPU limitations. - */ -#define TEX_PACKED_NUM_IMAGES 1024 - -/* color to use when textures are not found */ -#define TEX_IMAGE_MISSING_R 1 -#define TEX_IMAGE_MISSING_G 0 -#define TEX_IMAGE_MISSING_B 1 -#define TEX_IMAGE_MISSING_A 1 - class Device; class DeviceScene; class Progress; |