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/render | |
| 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/render')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index d3fef51e9e9..8f921d7850a 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -37,6 +37,7 @@ set(INC ../nodes ../physics ../draw + ../gpu ../../../intern/atomic ../../../intern/guardedalloc ../../../intern/mikktspace diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 82595527d30..af8746a4734 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -97,7 +97,7 @@ #include "../../../windowmanager/WM_api.h" /* XXX */ #include "../../../windowmanager/wm_window.h" /* XXX */ -#include "../../../intern/gawain/gawain/gwn_context.h" +#include "GPU_context.h" #ifdef WITH_FREESTYLE # include "FRS_freestyle.h" |