From 4536de98d18b8887edee37b03a12da015590bb45 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 1 Sep 2022 12:32:28 -0300 Subject: GPU: remove 'GPU_SHADER_2D_SMOOTH_COLOR' The only real difference between `GPU_SHADER_2D_SMOOTH_COLOR` and `GPU_SHADER_3D_SMOOTH_COLOR` is that in the vertex shader the 2D version uses `vec4(pos, 0.0, 1.0)` and the 3D version uses `vec4(pos, 1.0)`. But VBOs with 2D attributes work perfectly in shaders that use 3D attributes. Components not specified are filled with components from `vec4(0.0, 0.0, 0.0, 1.0)`. So there is no real benefit to having two different shader versions. This will simplify porting shaders to python as it will not be necessary to use a 3D and a 2D version of the shaders. In python the new name for '2D_SMOOTH_COLOR' and '3D_SMOOTH_COLOR' is 'SMOOTH_COLOR', but the old names still work for backward compatibility. --- .../gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl | 7 ------- .../gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl | 6 ------ .../shaders/infos/gpu_shader_2D_smooth_color_info.hh | 20 -------------------- 3 files changed, 33 deletions(-) delete mode 100644 source/blender/gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl delete mode 100644 source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl delete mode 100644 source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh (limited to 'source/blender/gpu/shaders') diff --git a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl deleted file mode 100644 index 8690ba0767a..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl +++ /dev/null @@ -1,7 +0,0 @@ -#pragma BLENDER_REQUIRE(gpu_shader_colorspace_lib.glsl) - -void main() -{ - fragColor = finalColor; - fragColor = blender_srgb_to_framebuffer_space(fragColor); -} diff --git a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl deleted file mode 100644 index cf948bb2533..00000000000 --- a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl +++ /dev/null @@ -1,6 +0,0 @@ - -void main() -{ - gl_Position = ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0); - finalColor = color; -} diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh deleted file mode 100644 index d6edeef0dfb..00000000000 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later - * Copyright 2022 Blender Foundation. All rights reserved. */ - -/** \file - * \ingroup gpu - */ - -#include "gpu_interface_info.hh" -#include "gpu_shader_create_info.hh" - -GPU_SHADER_CREATE_INFO(gpu_shader_2D_smooth_color) - .vertex_in(0, Type::VEC2, "pos") - .vertex_in(1, Type::VEC4, "color") - .vertex_out(smooth_color_iface) - .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(Type::MAT4, "ModelViewProjectionMatrix") - .vertex_source("gpu_shader_2D_smooth_color_vert.glsl") - .fragment_source("gpu_shader_2D_smooth_color_frag.glsl") - .additional_info("gpu_srgb_to_framebuffer_space") - .do_static_compilation(true); -- cgit v1.2.3