From 9c916b0172350fa405c578db7487c49ea65c0f26 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 15 Apr 2016 23:01:20 +0200 Subject: Cleanup: Move texture definitions to util, to avoid bad level include. --- intern/cycles/kernel/kernel_math.h | 1 + intern/cycles/kernel/kernel_types.h | 2 -- intern/cycles/render/image.cpp | 1 + intern/cycles/render/image.h | 27 ------------------- intern/cycles/render/scene.h | 3 +-- intern/cycles/util/CMakeLists.txt | 1 + intern/cycles/util/util_texture.h | 53 +++++++++++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 intern/cycles/util/util_texture.h diff --git a/intern/cycles/kernel/kernel_math.h b/intern/cycles/kernel/kernel_math.h index 453f4c8b421..9bee5603474 100644 --- a/intern/cycles/kernel/kernel_math.h +++ b/intern/cycles/kernel/kernel_math.h @@ -20,6 +20,7 @@ #include "util_color.h" #include "util_math.h" #include "util_math_fast.h" +#include "util_texture.h" #include "util_transform.h" #endif /* __KERNEL_MATH_H__ */ diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index cce4ded3013..c9a895d9aec 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -48,8 +48,6 @@ CCL_NAMESPACE_BEGIN #define BECKMANN_TABLE_SIZE 256 -#define TEX_NUM_FLOAT_IMAGES 5 - #define SHADER_NONE (~0) #define OBJECT_NONE (~0) #define PRIM_NONE (~0) diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 0bebdaf8a67..3bf3cae2b85 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -22,6 +22,7 @@ #include "util_image.h" #include "util_path.h" #include "util_progress.h" +#include "util_texture.h" #ifdef WITH_OSL #include 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; diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 026bef4088c..db70ae3c176 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -22,11 +22,10 @@ #include "device_memory.h" -#include "kernel_types.h" - #include "util_param.h" #include "util_string.h" #include "util_system.h" +#include "util_texture.h" #include "util_thread.h" #include "util_types.h" #include "util_vector.h" 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__ */ -- cgit v1.2.3