diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-09-16 15:55:04 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-09-16 15:55:04 +0300 |
commit | bf05b998b6ec2aaac072fbd39a3f221af5aeef3d (patch) | |
tree | 56636c567ef056a6fd3141355add72f0350c077c /source/blender/draw/intern | |
parent | 4b326d5a78b63aae7e5a788ef489aa95315456dd (diff) |
Revert "EEVEE: Fix volumetric resolve in large scenes."
This reverts commit 34051fcc12f388375697dcfc6da53e9909058fe1.
Although for normal use this doesn't make a difference. But when working with
huge scenes and volumetrics + NVIDIA it made a work-around not possible anymore.
For the heist production we added a fix on the render-farm (enable GPU workarounds).
{rB34051fcc12f388375697dcfc6da53e9909058fe1} made another work-around not
accessible anymore and it and was requested to revert this change.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index b49203d85f6..7b80ffd2b88 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -207,10 +207,6 @@ struct GPUShader *DRW_shader_create_with_lib_ex(const char *vert, const char *lib, const char *defines, const char *name); -struct GPUShader *DRW_shader_create_compute_with_shaderlib(const char *comp, - const DRWShaderLibrary *lib, - const char *defines, - const char *name); struct GPUShader *DRW_shader_create_with_shaderlib_ex(const char *vert, const char *geom, const char *frag, diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 1ada99093c6..4bc3898c5e7 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -297,18 +297,6 @@ GPUShader *DRW_shader_create_with_lib_ex(const char *vert, return sh; } -GPUShader *DRW_shader_create_compute_with_shaderlib(const char *comp, - const DRWShaderLibrary *lib, - const char *defines, - const char *name) -{ - char *comp_with_lib = DRW_shader_library_create_shader_string(lib, comp); - GPUShader *sh = GPU_shader_create_compute(comp_with_lib, NULL, defines, name); - MEM_SAFE_FREE(comp_with_lib); - - return sh; -} - GPUShader *DRW_shader_create_with_shaderlib_ex(const char *vert, const char *geom, const char *frag, |