forked from bartvdbraak/blender
Cleanup: Move texture definitions to util, to avoid bad level include.
This commit is contained in:
parent
34c99fa30a
commit
9c916b0172
@ -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__ */
|
||||
|
@ -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)
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "util_image.h"
|
||||
#include "util_path.h"
|
||||
#include "util_progress.h"
|
||||
#include "util_texture.h"
|
||||
|
||||
#ifdef WITH_OSL
|
||||
#include <OSL/oslexec.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;
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
53
intern/cycles/util/util_texture.h
Normal file
53
intern/cycles/util/util_texture.h
Normal file
@ -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__ */
|
Loading…
Reference in New Issue
Block a user