[Bf-blender-cvs] [8a4f1f99ad2] viewport-compositor: Viewport Compositor: Port Exposure node

[Omar Emara]

Commit: 8a4f1f99ad251bf8ebff8391cd988acc29ab1604
Author: Omar Emara
Date:   Wed Nov 3 12:51:48 2021 +0200
Branches: viewport-compositor
https://developer.blender.org/rB8a4f1f99ad251bf8ebff8391cd988acc29ab1604

Viewport Compositor: Port Exposure node

This patch ports the Exposure 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_exposure.glsl
M	source/blender/nodes/composite/nodes/node_composite_exposure.cc

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 2ac3dfa17b9..05b43b3ed57 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -284,6 +284,7 @@ data_to_c_simple(shaders/composite/gpu_shader_composite_bright_contrast.glsl SRC
 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_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 0c8cdef50ce..5f3869ba2ea 100644
--- a/source/blender/gpu/intern/gpu_material_library.c
+++ b/source/blender/gpu/intern/gpu_material_library.c
@@ -50,6 +50,7 @@ extern char datatoc_gpu_shader_composite_bright_contrast_glsl[];
 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_image_glsl[];
 extern char datatoc_gpu_shader_composite_invert_glsl[];
 
@@ -187,6 +188,11 @@ static GPUMaterialLibrary gpu_shader_composite_composite_library = {
     .dependencies = {NULL},
 };
 
+static GPUMaterialLibrary gpu_shader_composite_exposure_library = {
+    .code = datatoc_gpu_shader_composite_exposure_glsl,
+    .dependencies = {NULL},
+};
+
 static GPUMaterialLibrary gpu_shader_composite_image_library = {
     .code = datatoc_gpu_shader_composite_image_glsl,
     .dependencies = {NULL},
@@ -728,6 +734,7 @@ static GPUMaterialLibrary *gpu_material_libraries[] = {
     &gpu_shader_composite_color_balance_library,
     &gpu_shader_composite_color_correction_library,
     &gpu_shader_composite_composite_library,
+    &gpu_shader_composite_exposure_library,
     &gpu_shader_composite_image_library,
     &gpu_shader_composite_invert_library,
     NULL};
diff --git a/source/blender/gpu/shaders/composite/gpu_shader_composite_exposure.glsl b/source/blender/gpu/shaders/composite/gpu_shader_composite_exposure.glsl
new file mode 100644
index 00000000000..206fd25cd4b
--- /dev/null
+++ b/source/blender/gpu/shaders/composite/gpu_shader_composite_exposure.glsl
@@ -0,0 +1,6 @@
+void node_composite_exposure(vec4 color, float exposure, out vec4 result)
+{
+  float multiplier = pow(2.0, exposure);
+  result.rgb = color.rgb * multiplier;
+  result.a = color.a;
+}
diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
index fd959376afe..71a385edea0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc
@@ -36,12 +36,22 @@ static void cmp_node_exposure_declare(NodeDeclarationBuilder &b)
 
 }  // namespace blender::nodes
 
+static int node_composite_gpu_exposure(GPUMaterial *mat,
+                                       bNode *node,
+                                       bNodeExecData *UNUSED(execdata),
+                                       GPUNodeStack *in,
+                                       GPUNodeStack *out)
+{
+  return GPU_stack_link(mat, node, "node_composite_exposure", in, out);
+}
+
 void register_node_type_cmp_exposure(void)
 {
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_EXPOSURE, "Exposure", NODE_CLASS_OP_COLOR, 0);
   ntype.declare = blender::nodes::cmp_node_exposure_declare;
+  node_type_gpu(&ntype, node_composite_gpu_exposure);
 
   nodeRegisterType(&ntype);
 }