Cleanup: more renaming in the render/ module for consistency

source/blender/blenkernel/intern/blender.c

@@ -58,7 +58,7 @@
 #include "DEG_depsgraph.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "SEQ_sequencer.h"
 

source/blender/blenkernel/intern/brush.c

@@ -50,7 +50,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "RE_render_ext.h" /* RE_texture_evaluate */
+#include "RE_texture.h" /* RE_texture_evaluate */
 
 #include "BLO_read_write.h"
 

source/blender/blenkernel/intern/dynamicpaint.c

@@ -76,9 +76,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-/* to read material/texture color */
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "atomic_ops.h"
 

source/blender/blenkernel/intern/effect.c

@@ -68,8 +68,7 @@
 #include "DEG_depsgraph_physics.h"
 #include "DEG_depsgraph_query.h"
 
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 EffectorWeights *BKE_effector_add_weights(Collection *collection)
 {

source/blender/blenkernel/intern/fluid.c

@@ -80,7 +80,7 @@
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_query.h"
 
-#  include "RE_shader_ext.h"
+#  include "RE_texture.h"
 
 #  include "CLG_log.h"
 

source/blender/blenkernel/intern/ocean.c

@@ -47,7 +47,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "BLI_hash.h"
 

source/blender/blenkernel/intern/particle.c

@@ -83,7 +83,7 @@
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "BLO_read_write.h"
 

source/blender/blenkernel/intern/particle_system.c

@@ -83,7 +83,7 @@
 
 #include "PIL_time.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /* FLUID sim particle import */
 #ifdef WITH_FLUID

source/blender/blenkernel/intern/texture.c

@@ -67,7 +67,7 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "BLO_read_write.h"
 

source/blender/compositor/operations/COM_AntiAliasOperation.cpp

@@ -22,7 +22,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 /* An implementation of the Scale3X edge-extrapolation algorithm.
  *

source/blender/compositor/operations/COM_CompositorOperation.cpp

@@ -25,8 +25,7 @@
 #include "BLI_threads.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "render_types.h"
 

source/blender/compositor/operations/COM_ImageOperation.cpp

@@ -27,9 +27,9 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 BaseImageOperation::BaseImageOperation()
 {

source/blender/compositor/operations/COM_ImageOperation.h

@@ -25,8 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /**
  * \brief Base class for all image operations

source/blender/compositor/operations/COM_RenderLayersProg.cpp

@@ -23,8 +23,7 @@
 #include "DNA_scene_types.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /* ******** Render Layers Base Prog ******** */
 

source/blender/compositor/operations/COM_TextureOperation.h

@@ -24,8 +24,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "RE_pipeline.h"
-#include "RE_render_ext.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /**
  * Base class for all renderlayeroperations

source/blender/editors/mesh/editmesh_tools.c

@@ -75,7 +75,7 @@
 #include "ED_uvedit.h"
 #include "ED_view3d.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"

source/blender/editors/object/object_bake.c

@@ -53,7 +53,7 @@
 
 #include "RE_multires_bake.h"
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "PIL_time.h"
 

source/blender/editors/render/render_preview.c

@@ -86,7 +86,7 @@
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "WM_api.h"
 #include "WM_types.h"

source/blender/editors/sculpt_paint/paint_utils.c

@@ -64,7 +64,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "ED_screen.h"
 #include "ED_view3d.h"

source/blender/makesrna/intern/rna_nodetree.c

@@ -55,7 +55,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"

source/blender/makesrna/intern/rna_texture_api.c

@@ -36,7 +36,7 @@
 #  include "IMB_imbuf.h"
 #  include "IMB_imbuf_types.h"
 #  include "RE_pipeline.h"
-#  include "RE_shader_ext.h"
+#  include "RE_texture.h"
 
 static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4])
 {

source/blender/modifiers/intern/MOD_displace.c

@@ -61,7 +61,7 @@
 #include "MOD_ui_common.h"
 #include "MOD_util.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /* Displace */
 

source/blender/modifiers/intern/MOD_volume_displace.cc

@@ -45,7 +45,7 @@
 #include "MOD_modifiertypes.h"
 #include "MOD_ui_common.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "RNA_access.h"
 

source/blender/modifiers/intern/MOD_warp.c

@@ -57,7 +57,7 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "MOD_ui_common.h"
 #include "MOD_util.h"

source/blender/modifiers/intern/MOD_wave.c

@@ -51,7 +51,8 @@
 #include "RNA_access.h"
 
 #include "MEM_guardedalloc.h"
-#include "RE_shader_ext.h"
+
+#include "RE_texture.h"
 
 #include "MOD_modifiertypes.h"
 #include "MOD_ui_common.h"

source/blender/modifiers/intern/MOD_weightvg_util.c

@@ -55,7 +55,7 @@
 #include "MOD_ui_common.h"
 #include "MOD_util.h"
 #include "MOD_weightvg_util.h"
-#include "RE_shader_ext.h" /* Texture masking. */
+#include "RE_texture.h" /* Texture masking. */
 
 /* Maps new_w weights in place, using either one of the predefined functions, or a custom curve.
  * Return values are in new_w.

source/blender/nodes/shader/node_shader_tree.c

@@ -50,7 +50,7 @@
 
 #include "GPU_material.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "NOD_common.h"
 

source/blender/nodes/shader/node_shader_util.h

@@ -63,7 +63,7 @@
 #include "IMB_colormanagement.h"
 
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #include "GPU_material.h"
 #include "GPU_texture.h"

source/blender/nodes/shader/nodes/node_shader_particle_info.c

@@ -18,7 +18,7 @@
  */
 
 #include "../node_shader_util.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 static bNodeSocketTemplate outputs[] = {
     {SOCK_FLOAT, "Index"},

source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c

@@ -19,7 +19,7 @@
 
 #include "../node_shader_util.h"
 
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 /* **************** OUTPUT ******************** */
 

source/blender/nodes/texture/node_texture_tree.c

@@ -48,7 +48,7 @@
 
 #include "RNA_access.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 static void texture_get_from_context(const bContext *C,
                                      bNodeTreeType *UNUSED(treetype),

source/blender/nodes/texture/node_texture_util.h

@@ -61,7 +61,7 @@
 #include "IMB_imbuf_types.h"
 
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 #ifdef __cplusplus
 extern "C" {

source/blender/nodes/texture/nodes/node_texture_proc.c

@@ -24,7 +24,7 @@
 #include "NOD_texture.h"
 #include "node_texture_util.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 /*
  * In this file: wrappers to use procedural textures as nodes

source/blender/nodes/texture/nodes/node_texture_texture.c

@@ -24,7 +24,7 @@
 #include "NOD_texture.h"
 #include "node_texture_util.h"
 
-#include "RE_shader_ext.h"
+#include "RE_texture.h"
 
 static bNodeSocketTemplate inputs[] = {
     {SOCK_RGBA, N_("Color1"), 1.0f, 1.0f, 1.0f, 1.0f},

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

source/blender/render/RE_shader_ext.h

@@ -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

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

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,

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"
 

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"

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;
 

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;
 

source/creator/creator.c

@@ -72,7 +72,7 @@
 #include "IMB_imbuf.h" /* For #IMB_init. */
 
 #include "RE_engine.h"
-#include "RE_render_ext.h"
+#include "RE_texture.h"
 
 #include "ED_datafiles.h"