[Bf-blender-cvs] [8af0e529218] viewport-compositor: Viewport Compositor: Port Gamma node

[Omar Emara]

Commit: 8af0e52921896db3559a5e8b4232f9fd8f980e89
Author: Omar Emara
Date:   Wed Nov 3 13:46:50 2021 +0200
Branches: viewport-compositor
https://developer.blender.org/rB8af0e52921896db3559a5e8b4232f9fd8f980e89

Viewport Compositor: Port Gamma node

This patch ports the Gamma node to the viewport compositor. The shader
is a straightforward port of the compositor code.

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

M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/intern/gpu_material_library.c
A	source/blender/gpu/shaders/composite/gpu_shader_composite_gamma.glsl
M	source/blender/nodes/composite/nodes/node_composite_gamma.cc

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 05b43b3ed57..1c918ae8694 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -285,6 +285,7 @@ data_to_c_simple(shaders/composite/gpu_shader_composite_color_balance.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_color_correction.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_composite.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_exposure.glsl SRC)
+data_to_c_simple(shaders/composite/gpu_shader_composite_gamma.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_image.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_invert.glsl SRC)
 
diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c
index 5f3869ba2ea..c47644939aa 100644
--- a/source/blender/gpu/intern/gpu_material_library.c
+++ b/source/blender/gpu/intern/gpu_material_library.c
@@ -51,6 +51,7 @@ extern char datatoc_gpu_shader_composite_color_balance_glsl[];
 extern char datatoc_gpu_shader_composite_color_correction_glsl[];
 extern char datatoc_gpu_shader_composite_composite_glsl[];
 extern char datatoc_gpu_shader_composite_exposure_glsl[];
+extern char datatoc_gpu_shader_composite_gamma_glsl[];
 extern char datatoc_gpu_shader_composite_image_glsl[];
 extern char datatoc_gpu_shader_composite_invert_glsl[];
 
@@ -193,6 +194,11 @@ static GPUMaterialLibrary gpu_shader_composite_exposure_library = {
     .dependencies = {NULL},
 };
 
+static GPUMaterialLibrary gpu_shader_composite_gamma_library = {
+    .code = datatoc_gpu_shader_composite_gamma_glsl,
+    .dependencies = {&gpu_shader_common_math_util_library, NULL},
+};
+
 static GPUMaterialLibrary gpu_shader_composite_image_library = {
     .code = datatoc_gpu_shader_composite_image_glsl,
     .dependencies = {NULL},
@@ -735,6 +741,7 @@ static GPUMaterialLibrary *gpu_material_libraries[] = {
     &gpu_shader_composite_color_correction_library,
     &gpu_shader_composite_composite_library,
     &gpu_shader_composite_exposure_library,
+    &gpu_shader_composite_gamma_library,
     &gpu_shader_composite_image_library,
     &gpu_shader_composite_invert_library,
     NULL};
diff --git a/source/blender/gpu/shaders/composite/gpu_shader_composite_gamma.glsl b/source/blender/gpu/shaders/composite/gpu_shader_composite_gamma.glsl
new file mode 100644
index 00000000000..caf3b4634df
--- /dev/null
+++ b/source/blender/gpu/shaders/composite/gpu_shader_composite_gamma.glsl
@@ -0,0 +1,5 @@
+void node_composite_gamma(vec4 color, float gamma, out vec4 result)
+{
+  result.rgb = fallback_pow(color.rgb, gamma, color.rgb);
+  result.a = color.a;
+}
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc
index a29a001688a..d0d54d0af04 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc
@@ -37,12 +37,22 @@ static void cmp_node_gamma_declare(NodeDeclarationBuilder &b)
 
 }  // namespace blender::nodes
 
+static int node_composite_gpu_gamma(GPUMaterial *mat,
+                                    bNode *node,
+                                    bNodeExecData *UNUSED(execdata),
+                                    GPUNodeStack *in,
+                                    GPUNodeStack *out)
+{
+  return GPU_stack_link(mat, node, "node_composite_gamma", in, out);
+}
+
 void register_node_type_cmp_gamma(void)
 {
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, 0);
   ntype.declare = blender::nodes::cmp_node_gamma_declare;
+  node_type_gpu(&ntype, node_composite_gpu_gamma);
 
   nodeRegisterType(&ntype);
 }