diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-17 22:11:23 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-18 01:17:57 +0300 |
| commit | 247ad2034de2c33a6d9cb7d3b6f1ef7ffa5b859d (patch) | |
| tree | 153014a1b6f2fc8c09dddb11ef752eae047b3509 /source/blender/draw | |
| parent | 6329629bb9eab86a989367a148154a7ebfa074df (diff) | |
GWN: Port to GPU module: Move files to GPU
This does not include all the struct and type renaming. Only files were
renamed.
gwn_batch.c/h was fusioned with GPU_batch.c/h
gwn_immediate.c/h was fusioned with GPU_immediate.c/h
gwn_imm_util.c/h was fusioned with GPU_immediate_util.c/h
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightcache.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index bf3ee34a03e..a6d11f1edac 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -45,7 +45,7 @@ #include "eevee_lightcache.h" #include "eevee_private.h" -#include "../../../intern/gawain/gawain/gwn_context.h" +#include "GPU_context.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 58ce9dd5218..4c6f8962d82 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -82,7 +82,7 @@ #include "engines/workbench/workbench_engine.h" #include "engines/external/external_engine.h" -#include "../../../intern/gawain/gawain/gwn_context.h" +#include "GPU_context.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index d25e372c26e..2d44fb5b6d8 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -35,6 +35,7 @@ #include "BLI_threads.h" #include "GPU_batch.h" +#include "GPU_context.h" #include "GPU_framebuffer.h" #include "GPU_shader.h" #include "GPU_uniformbuffer.h" |