diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:02:45 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-09-14 00:03:10 +0300 |
| commit | fd5c1972cd5c8a826c0d40effb0e2d367389666a (patch) | |
| tree | 6a093944267ff888e9fb4323bac22d52468ab7ec /source/blender/draw/engines/workbench/workbench_volume.c | |
| parent | c80564ef9f557fadd235b87533b24d126e2138c9 (diff) | |
Revert "DRW: Refactor to support draw call batching"
This reverts commit ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_volume.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_volume.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index e017661b6cd..7ae9d90daff 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -27,7 +27,6 @@ #include "BLI_rand.h" #include "BLI_dynstr.h" -#include "BLI_string_utils.h" #include "DNA_modifier_types.h" #include "DNA_object_force_types.h" @@ -55,7 +54,6 @@ static struct { extern char datatoc_workbench_volume_vert_glsl[]; extern char datatoc_workbench_volume_frag_glsl[]; extern char datatoc_common_view_lib_glsl[]; -extern char datatoc_gpu_shader_common_obinfos_lib_glsl[]; static GPUShader *volume_shader_get(bool slice, bool coba, bool cubic) { @@ -80,16 +78,12 @@ static GPUShader *volume_shader_get(bool slice, bool coba, bool cubic) char *defines = BLI_dynstr_get_cstring(ds); BLI_dynstr_free(ds); - char *libs = BLI_string_joinN(datatoc_common_view_lib_glsl, - datatoc_gpu_shader_common_obinfos_lib_glsl); - e_data.volume_sh[id] = DRW_shader_create_with_lib(datatoc_workbench_volume_vert_glsl, NULL, datatoc_workbench_volume_frag_glsl, - libs, + datatoc_common_view_lib_glsl, defines); - MEM_freeN(libs); MEM_freeN(defines); } |