diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 17:42:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 18:19:49 +0300 |
commit | 880b0f981dce558d0661c1b838753fb7a07945c1 (patch) | |
tree | 84860cc0ae2b49d0c3f4a85ee7367408eb34313e /source/blender/render | |
parent | 4f66cf3b8bb02f2c7c7c235ad7039ba1aa43212a (diff) |
Cleanup: more renaming in the render/ module for consistency
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/render/RE_shader_ext.h | 83 | ||||
-rw-r--r-- | source/blender/render/RE_texture.h (renamed from source/blender/render/RE_render_ext.h) | 41 | ||||
-rw-r--r-- | source/blender/render/intern/bake.c (renamed from source/blender/render/intern/bake_api.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/engine.c (renamed from source/blender/render/intern/external_engine.c) | 0 | ||||
-rw-r--r-- | source/blender/render/intern/multires_bake.c | 7 | ||||
-rw-r--r-- | source/blender/render/intern/pipeline.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/texture_image.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/texture_pointdensity.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/texture_procedural.c | 3 |
10 files changed, 54 insertions, 95 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 6e229fd25b7..2516c015924 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -42,8 +42,8 @@ set(INC set(SRC - intern/bake_api.c - intern/external_engine.c + intern/bake.c + intern/engine.c intern/initrender.c intern/multires_bake.c intern/pipeline.c @@ -57,8 +57,7 @@ set(SRC RE_engine.h RE_multires_bake.h RE_pipeline.h - RE_render_ext.h - RE_shader_ext.h + RE_texture.h intern/initrender.h intern/render_result.h diff --git a/source/blender/render/RE_shader_ext.h b/source/blender/render/RE_shader_ext.h deleted file mode 100644 index d9d5a924949..00000000000 --- a/source/blender/render/RE_shader_ext.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2006 by Blender Foundation - * All rights reserved. - */ -/** \file - * \ingroup render - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* this include is for texture exports */ -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -/* localized texture result data */ -/* note; tr tg tb ta has to remain in this order */ -typedef struct TexResult { - float tin, tr, tg, tb, ta; - int talpha; - float *nor; -} TexResult; - -typedef struct BakeImBufuserData { - float *displacement_buffer; - char *mask_buffer; -} BakeImBufuserData; - -/* node shaders... */ -struct ImagePool; -struct MTex; -struct Tex; - -/* this one uses nodes */ -int multitex_ext(struct Tex *tex, - float texvec[3], - float dxt[3], - float dyt[3], - int osatex, - struct TexResult *texres, - const short thread, - struct ImagePool *pool, - bool scene_color_manage, - const bool skip_load_image); -/* nodes disabled */ -int multitex_ext_safe(struct Tex *tex, - const float texvec[3], - struct TexResult *texres, - struct ImagePool *pool, - bool scene_color_manage, - const bool skip_load_image); -/* only for internal node usage */ -int multitex_nodes(struct Tex *tex, - const float texvec[3], - float dxt[3], - float dyt[3], - int osatex, - struct TexResult *texres, - const short thread, - short which_output, - struct MTex *mtex, - struct ImagePool *pool); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_render_ext.h b/source/blender/render/RE_texture.h index 28a22399892..b394cfeee75 100644 --- a/source/blender/render/RE_render_ext.h +++ b/source/blender/render/RE_texture.h @@ -30,6 +30,7 @@ struct Depsgraph; struct ImagePool; struct MTex; +struct Tex; #ifdef __cplusplus extern "C" { @@ -75,6 +76,46 @@ void RE_point_density_free(struct PointDensity *pd); void RE_point_density_fix_linking(void); +/* texture_procedural.c */ + +/* Texture evaluation result. + * Note; tr tg tb ta has to remain in this order for array access. */ +typedef struct TexResult { + float tin, tr, tg, tb, ta; + int talpha; + float *nor; +} TexResult; + +/* This one uses nodes. */ +int multitex_ext(struct Tex *tex, + float texvec[3], + float dxt[3], + float dyt[3], + int osatex, + struct TexResult *texres, + const short thread, + struct ImagePool *pool, + bool scene_color_manage, + const bool skip_load_image); +/* Nodes disabled. */ +int multitex_ext_safe(struct Tex *tex, + const float texvec[3], + struct TexResult *texres, + struct ImagePool *pool, + bool scene_color_manage, + const bool skip_load_image); +/* Only for internal node usage. */ +int multitex_nodes(struct Tex *tex, + const float texvec[3], + float dxt[3], + float dyt[3], + int osatex, + struct TexResult *texres, + const short thread, + short which_output, + struct MTex *mtex, + struct ImagePool *pool); + #ifdef __cplusplus } #endif diff --git a/source/blender/render/intern/bake_api.c b/source/blender/render/intern/bake.c index 6f5db4986f2..6f5db4986f2 100644 --- a/source/blender/render/intern/bake_api.c +++ b/source/blender/render/intern/bake.c diff --git a/source/blender/render/intern/external_engine.c b/source/blender/render/intern/engine.c index 9a3dc0d000c..9a3dc0d000c 100644 --- a/source/blender/render/intern/external_engine.c +++ b/source/blender/render/intern/engine.c diff --git a/source/blender/render/intern/multires_bake.c b/source/blender/render/intern/multires_bake.c index ea18f151e1e..a4f68419c67 100644 --- a/source/blender/render/intern/multires_bake.c +++ b/source/blender/render/intern/multires_bake.c @@ -46,7 +46,7 @@ #include "RE_multires_bake.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -111,6 +111,11 @@ typedef struct { const int *orig_index_mp_to_orig; } MNormalBakeData; +typedef struct BakeImBufuserData { + float *displacement_buffer; + char *mask_buffer; +} BakeImBufuserData; + static void multiresbake_get_normal(const MResolvePixelData *data, float norm[], const int tri_num, diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 1bc6a056cda..3d19e5e6c15 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -86,7 +86,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "SEQ_sequencer.h" diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c index 26d9f12c91e..cd34226920d 100644 --- a/source/blender/render/intern/texture_image.c +++ b/source/blender/render/intern/texture_image.c @@ -46,8 +46,7 @@ #include "BKE_image.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "render_types.h" #include "texture_common.h" diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index 0e62eea5b11..e2568e0a013 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -56,8 +56,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static ThreadMutex sample_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/source/blender/render/intern/texture_procedural.c b/source/blender/render/intern/texture_procedural.c index 7f93addb76d..a98f29a705d 100644 --- a/source/blender/render/intern/texture_procedural.c +++ b/source/blender/render/intern/texture_procedural.c @@ -57,8 +57,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static RNG_THREAD_ARRAY *random_tex_array; |