From edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 17 Jan 2022 14:34:28 +0100 Subject: Revert "GPUShaderCreateInfo for interface abstraction" This reverts commit 8fb2ff458ba579dba08bfdf57d043ad158b5db07. Missing some files. --- source/blender/gpu/intern/gpu_shader_private.hh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'source/blender/gpu/intern/gpu_shader_private.hh') diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh index 7837af0dcf2..498dd8f3877 100644 --- a/source/blender/gpu/intern/gpu_shader_private.hh +++ b/source/blender/gpu/intern/gpu_shader_private.hh @@ -24,12 +24,9 @@ #include "BLI_string_ref.hh" #include "GPU_shader.h" -#include "gpu_shader_create_info.hh" #include "gpu_shader_interface.hh" #include "gpu_vertex_buffer_private.hh" -#include - namespace blender { namespace gpu { @@ -56,7 +53,7 @@ class Shader { virtual void geometry_shader_from_glsl(MutableSpan sources) = 0; virtual void fragment_shader_from_glsl(MutableSpan sources) = 0; virtual void compute_shader_from_glsl(MutableSpan sources) = 0; - virtual bool finalize(const shader::ShaderCreateInfo *info = nullptr) = 0; + virtual bool finalize() = 0; virtual void transform_feedback_names_set(Span name_list, eGPUShaderTFBType geom_type) = 0; @@ -71,13 +68,6 @@ class Shader { virtual void vertformat_from_shader(GPUVertFormat *) const = 0; - std::string defines_declare(const shader::ShaderCreateInfo &info) const; - virtual std::string resources_declare(const shader::ShaderCreateInfo &info) const = 0; - virtual std::string vertex_interface_declare(const shader::ShaderCreateInfo &info) const = 0; - virtual std::string fragment_interface_declare(const shader::ShaderCreateInfo &info) const = 0; - virtual std::string geometry_interface_declare(const shader::ShaderCreateInfo &info) const = 0; - virtual std::string geometry_layout_declare(const shader::ShaderCreateInfo &info) const = 0; - /* DEPRECATED: Kept only because of BGL API. */ virtual int program_handle_get() const = 0; -- cgit v1.2.3