diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-30 14:55:13 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-30 17:44:58 +0300 |
| commit | da741013a1e1b2e7c4f61a9486588253a457afd2 (patch) | |
| tree | b491c53eadf1fcc07e2a326d000b1c94fbf07f48 /source/blender/draw/intern/draw_manager_shader.c | |
| parent | 55401fbb3d0daa82c999e388c2b5b87e7113b091 (diff) | |
EEVEE: GLSL refactor/cleanup
- add the use of DRWShaderLibrary to EEVEE's glsl codebase to reduce code
complexity and duplication.
- split bsdf_common_lib.glsl into multiple sub library which are now shared
with other engines.
- the surface shader code is now more organised and have its own files.
- change default world to use a material nodetree and make lookdev shader
more clear.
Reviewed By: jbakker
Differential Revision: https://developer.blender.org/D8306
Diffstat (limited to 'source/blender/draw/intern/draw_manager_shader.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 0bb20631537..bde08b770b3 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -430,7 +430,8 @@ GPUMaterial *DRW_shader_create_from_world(struct Scene *scene, const char *geom, const char *frag_lib, const char *defines, - bool deferred) + bool deferred, + GPUMaterialEvalCallbackFn *callback) { GPUMaterial *mat = NULL; if (DRW_state_is_image_render() || !deferred) { @@ -450,7 +451,8 @@ GPUMaterial *DRW_shader_create_from_world(struct Scene *scene, geom, frag_lib, defines, - wo->id.name); + wo->id.name, + callback); } if (GPU_material_status(mat) == GPU_MAT_QUEUED) { @@ -470,7 +472,8 @@ GPUMaterial *DRW_shader_create_from_material(struct Scene *scene, const char *geom, const char *frag_lib, const char *defines, - bool deferred) + bool deferred, + GPUMaterialEvalCallbackFn *callback) { GPUMaterial *mat = NULL; if (DRW_state_is_image_render() || !deferred) { @@ -490,7 +493,8 @@ GPUMaterial *DRW_shader_create_from_material(struct Scene *scene, geom, frag_lib, defines, - ma->id.name); + ma->id.name, + callback); } if (GPU_material_status(mat) == GPU_MAT_QUEUED) { |