[Bf-blender-cvs] [cc367908cd6] master: Cleanup: Remove more texture nodes preview handling

[Hans Goudey]

Commit: cc367908cd69da2e49517a6416f25bab04953aa1
Author: Hans Goudey
Date:   Sun Dec 19 18:37:28 2021 -0600
Branches: master
https://developer.blender.org/rBcc367908cd69da2e49517a6416f25bab04953aa1

Cleanup: Remove more texture nodes preview handling

Similar to the previous commit, this allowed removing a function to set
a single pixel of a node preview.

===================================================================

M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.cc
M	source/blender/nodes/texture/node_texture_util.c
M	source/blender/nodes/texture/node_texture_util.h
M	source/blender/nodes/texture/nodes/node_texture_output.c
M	source/blender/nodes/texture/nodes/node_texture_viewer.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 5e6a0885732..f42a3d5e294 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -971,14 +971,6 @@ void BKE_node_preview_merge_tree(struct bNodeTree *to_ntree,
                                  struct bNodeTree *from_ntree,
                                  bool remove_old);
 
-/**
- * Hack warning! this function is only used for shader previews,
- * and since it gets called multiple times per pixel for Z-transparency we only add the color once.
- * Preview gets cleared before it starts render though.
- */
-void BKE_node_preview_set_pixel(
-    struct bNodePreview *preview, const float col[4], int x, int y, bool do_manage);
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 560c29826ff..aaf6e1d9402 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -3069,27 +3069,6 @@ void BKE_node_preview_merge_tree(bNodeTree *to_ntree, bNodeTree *from_ntree, boo
   }
 }
 
-void BKE_node_preview_set_pixel(
-    bNodePreview *preview, const float col[4], int x, int y, bool do_manage)
-{
-  if (preview) {
-    if (x >= 0 && y >= 0) {
-      if (x < preview->xsize && y < preview->ysize) {
-        unsigned char *tar = preview->rect + 4 * ((preview->xsize * y) + x);
-
-        if (do_manage) {
-          linearrgb_to_srgb_uchar4(tar, col);
-        }
-        else {
-          rgba_float_to_uchar(tar, col);
-        }
-      }
-      // else printf("prv out bound x y %d %d\n", x, y);
-    }
-    // else printf("prv out bound x y %d %d\n", x, y);
-  }
-}
-
 /* ************** Free stuff ********** */
 
 void nodeUnlinkNode(bNodeTree *ntree, bNode *node)
diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c
index fe8e68bfc42..1ba693bf4a4 100644
--- a/source/blender/nodes/texture/node_texture_util.c
+++ b/source/blender/nodes/texture/node_texture_util.c
@@ -63,10 +63,6 @@ static void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, sh
 {
   if (dg->node->need_exec) {
     dg->fn(out, params, dg->node, dg->in, thread);
-
-    if (dg->cdata->do_preview) {
-      tex_do_preview(dg->preview, params->previewco, out, dg->cdata->do_manage);
-    }
   }
 }
 
@@ -123,19 +119,6 @@ void params_from_cdata(TexParams *out, TexCallData *in)
   out->mtex = in->mtex;
 }
 
-void tex_do_preview(bNodePreview *preview,
-                    const float coord[2],
-                    const float col[4],
-                    bool do_manage)
-{
-  if (preview) {
-    int xs = ((coord[0] + 1.0f) * 0.5f) * preview->xsize;
-    int ys = ((coord[1] + 1.0f) * 0.5f) * preview->ysize;
-
-    BKE_node_preview_set_pixel(preview, col, xs, ys, do_manage);
-  }
-}
-
 void tex_output(bNode *node,
                 bNodeExecData *execdata,
                 bNodeStack **in,
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index 84d2c5c903a..473cef81359 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -121,10 +121,6 @@ void tex_output(bNode *node,
                 bNodeStack *out,
                 TexFn texfn,
                 TexCallData *data);
-void tex_do_preview(bNodePreview *preview,
-                    const float coord[2],
-                    const float col[4],
-                    bool do_manage);
 
 void params_from_cdata(TexParams *out, TexCallData *in);
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 19e24c9f82a..50f41239581 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -37,7 +37,7 @@ static bNodeSocketTemplate inputs[] = {
 static void exec(void *data,
                  int UNUSED(thread),
                  bNode *node,
-                 bNodeExecData *execdata,
+                 bNodeExecData *UNUSED(execdata),
                  bNodeStack **in,
                  bNodeStack **UNUSED(out))
 {
@@ -54,7 +54,6 @@ static void exec(void *data,
     else {
       tex_input_rgba(&target->tr, in[0], &params, cdata->thread);
     }
-    tex_do_preview(execdata->preview, params.co, &target->tr, cdata->do_manage);
   }
   else {
     /* 0 means don't care, so just use first */
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c
index 18b11b86d6f..1c22561bec4 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.c
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c
@@ -36,7 +36,7 @@ static bNodeSocketTemplate outputs[] = {
 static void exec(void *data,
                  int UNUSED(thread),
                  bNode *UNUSED(node),
-                 bNodeExecData *execdata,
+                 bNodeExecData *UNUSED(execdata),
                  bNodeStack **in,
                  bNodeStack **UNUSED(out))
 {
@@ -48,7 +48,6 @@ static void exec(void *data,
     params_from_cdata(&params, cdata);
 
     tex_input_rgba(col, in[0], &params, cdata->thread);
-    tex_do_preview(execdata->preview, params.previewco, col, cdata->do_manage);
   }
 }