Cleanup: Remove unused functions
This commit is contained in:
@@ -236,43 +236,6 @@ void DRW_texture_free(GPUTexture *tex);
|
||||
|
||||
/* Shaders */
|
||||
GPUShader *DRW_shader_create_from_info_name(const char *info_name);
|
||||
GPUShader *DRW_shader_create_ex(
|
||||
const char *vert, const char *geom, const char *frag, const char *defines, const char *name);
|
||||
GPUShader *DRW_shader_create_with_lib_ex(const char *vert,
|
||||
const char *geom,
|
||||
const char *frag,
|
||||
const char *lib,
|
||||
const char *defines,
|
||||
const char *name);
|
||||
GPUShader *DRW_shader_create_with_shaderlib_ex(const char *vert,
|
||||
const char *geom,
|
||||
const char *frag,
|
||||
const DRWShaderLibrary *lib,
|
||||
const char *defines,
|
||||
const char *name);
|
||||
GPUShader *DRW_shader_create_with_transform_feedback(const char *vert,
|
||||
const char *geom,
|
||||
const char *defines,
|
||||
eGPUShaderTFBType prim_type,
|
||||
const char **varying_names,
|
||||
int varying_count);
|
||||
GPUShader *DRW_shader_create_fullscreen_ex(const char *frag,
|
||||
const char *defines,
|
||||
const char *name);
|
||||
GPUShader *DRW_shader_create_fullscreen_with_shaderlib_ex(const char *frag,
|
||||
const DRWShaderLibrary *lib,
|
||||
const char *defines,
|
||||
const char *name);
|
||||
#define DRW_shader_create(vert, geom, frag, defines) \
|
||||
DRW_shader_create_ex(vert, geom, frag, defines, __func__)
|
||||
#define DRW_shader_create_with_lib(vert, geom, frag, lib, defines) \
|
||||
DRW_shader_create_with_lib_ex(vert, geom, frag, lib, defines, __func__)
|
||||
#define DRW_shader_create_with_shaderlib(vert, geom, frag, lib, defines) \
|
||||
DRW_shader_create_with_shaderlib_ex(vert, geom, frag, lib, defines, __func__)
|
||||
#define DRW_shader_create_fullscreen(frag, defines) \
|
||||
DRW_shader_create_fullscreen_ex(frag, defines, __func__)
|
||||
#define DRW_shader_create_fullscreen_with_shaderlib(frag, lib, defines) \
|
||||
DRW_shader_create_fullscreen_with_shaderlib_ex(frag, lib, defines, __func__)
|
||||
void DRW_shader_init();
|
||||
void DRW_shader_exit();
|
||||
|
||||
|
||||
@@ -494,104 +494,6 @@ GPUShader *DRW_shader_create_from_info_name(const char *info_name)
|
||||
return GPU_shader_create_from_info_name(info_name);
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_ex(
|
||||
const char *vert, const char *geom, const char *frag, const char *defines, const char *name)
|
||||
{
|
||||
return GPU_shader_create(vert, frag, geom, std::nullopt, defines, name);
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_with_lib_ex(const char *vert,
|
||||
const char *geom,
|
||||
const char *frag,
|
||||
const char *lib,
|
||||
const char *defines,
|
||||
const char *name)
|
||||
{
|
||||
GPUShader *sh;
|
||||
char *vert_with_lib = nullptr;
|
||||
char *frag_with_lib = nullptr;
|
||||
char *geom_with_lib = nullptr;
|
||||
|
||||
vert_with_lib = BLI_string_joinN(lib, vert);
|
||||
frag_with_lib = BLI_string_joinN(lib, frag);
|
||||
if (geom) {
|
||||
geom_with_lib = BLI_string_joinN(lib, geom);
|
||||
}
|
||||
|
||||
sh = GPU_shader_create(vert_with_lib, frag_with_lib, geom_with_lib, std::nullopt, defines, name);
|
||||
|
||||
MEM_freeN(vert_with_lib);
|
||||
MEM_freeN(frag_with_lib);
|
||||
if (geom) {
|
||||
MEM_freeN(geom_with_lib);
|
||||
}
|
||||
|
||||
return sh;
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_with_shaderlib_ex(const char *vert,
|
||||
const char *geom,
|
||||
const char *frag,
|
||||
const DRWShaderLibrary *lib,
|
||||
const char *defines,
|
||||
const char *name)
|
||||
{
|
||||
GPUShader *sh;
|
||||
char *vert_with_lib = DRW_shader_library_create_shader_string(lib, vert);
|
||||
char *frag_with_lib = DRW_shader_library_create_shader_string(lib, frag);
|
||||
char *geom_with_lib = (geom) ? DRW_shader_library_create_shader_string(lib, geom) : nullptr;
|
||||
|
||||
sh = GPU_shader_create(vert_with_lib, frag_with_lib, geom_with_lib, std::nullopt, defines, name);
|
||||
|
||||
MEM_SAFE_FREE(vert_with_lib);
|
||||
MEM_SAFE_FREE(frag_with_lib);
|
||||
MEM_SAFE_FREE(geom_with_lib);
|
||||
|
||||
return sh;
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_with_transform_feedback(const char *vert,
|
||||
const char *geom,
|
||||
const char *defines,
|
||||
const eGPUShaderTFBType prim_type,
|
||||
const char **varying_names,
|
||||
const int varying_count)
|
||||
{
|
||||
return GPU_shader_create_ex(vert,
|
||||
datatoc_gpu_shader_depth_only_frag_glsl,
|
||||
geom,
|
||||
std::nullopt,
|
||||
std::nullopt,
|
||||
defines,
|
||||
prim_type,
|
||||
varying_names,
|
||||
varying_count,
|
||||
__func__);
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_fullscreen_ex(const char *frag, const char *defines, const char *name)
|
||||
{
|
||||
return GPU_shader_create(
|
||||
datatoc_common_fullscreen_vert_glsl, frag, std::nullopt, std::nullopt, defines, name);
|
||||
}
|
||||
|
||||
GPUShader *DRW_shader_create_fullscreen_with_shaderlib_ex(const char *frag,
|
||||
const DRWShaderLibrary *lib,
|
||||
const char *defines,
|
||||
const char *name)
|
||||
{
|
||||
|
||||
GPUShader *sh;
|
||||
char *vert = datatoc_common_fullscreen_vert_glsl;
|
||||
char *frag_with_lib = DRW_shader_library_create_shader_string(lib, frag);
|
||||
|
||||
sh = GPU_shader_create(vert, frag_with_lib, std::nullopt, std::nullopt, defines, name);
|
||||
|
||||
MEM_SAFE_FREE(frag_with_lib);
|
||||
|
||||
return sh;
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
||||
Reference in New Issue
Block a user