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 /intern/opencolorio | |
| 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 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 2611477252a..10898e4239b 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -27,8 +27,8 @@ set(INC . ../glew-mx ../guardedalloc - ../gawain ../../source/blender/blenlib + ../../source/blender/gpu ) set(INC_SYS diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 090422ff795..10acdb9d281 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -49,7 +49,7 @@ #endif extern "C" { -#include "gawain/gwn_immediate.h" +#include "GPU_immediate.h" } using namespace OCIO_NAMESPACE; |