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/util | |
parent | 34c99fa30ade70d7677972ab18acc4c6ad52558b (diff) |
Cleanup: Move texture definitions to util, to avoid bad level include.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/util/util_texture.h | 53 |
2 files changed, 54 insertions, 0 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 15e6c88c30f..cceec8d444c 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -73,6 +73,7 @@ set(SRC_HEADERS util_string.h util_system.h util_task.h + util_texture.h util_thread.h util_time.h util_transform.h diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h new file mode 100644 index 00000000000..0ae267571d2 --- /dev/null +++ b/intern/cycles/util/util_texture.h @@ -0,0 +1,53 @@ +/* + * Copyright 2011-2016 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __UTIL_TEXTURE_H__ +#define __UTIL_TEXTURE_H__ + +CCL_NAMESPACE_BEGIN + +/* Texture limits on various devices. */ + +#define TEX_NUM_FLOAT_IMAGES 5 + +/* 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 + +CCL_NAMESPACE_END + +#endif /* __UTIL_TEXTURE_H__ */ |