diff options
-rw-r--r-- | build_files/cmake/macros.cmake | 1 | ||||
-rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/gawain/CMakeLists.txt | 34 | ||||
-rw-r--r-- | intern/gawain/gawain/attrib_binding.h (renamed from source/blender/gpu/gawain/attrib_binding.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/batch.h (renamed from source/blender/gpu/gawain/batch.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/buffer_id.h (renamed from source/blender/gpu/gawain/buffer_id.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/common.h (renamed from source/blender/gpu/gawain/common.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/element.h (renamed from source/blender/gpu/gawain/element.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/imm_util.h (renamed from source/blender/gpu/gawain/imm_util.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/immediate.h (renamed from source/blender/gpu/gawain/immediate.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/primitive.h (renamed from source/blender/gpu/gawain/primitive.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/shader_interface.h (renamed from source/blender/gpu/gawain/shader_interface.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/vertex_buffer.h (renamed from source/blender/gpu/gawain/vertex_buffer.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/vertex_format.h (renamed from source/blender/gpu/gawain/vertex_format.h) | 0 | ||||
-rw-r--r-- | intern/gawain/src/attrib_binding.c (renamed from source/blender/gpu/gawain/attrib_binding.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/batch.c (renamed from source/blender/gpu/gawain/batch.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/buffer_id.cpp (renamed from source/blender/gpu/gawain/buffer_id.cpp) | 0 | ||||
-rw-r--r-- | intern/gawain/src/element.c (renamed from source/blender/gpu/gawain/element.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/imm_util.c (renamed from source/blender/gpu/gawain/imm_util.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/immediate.c (renamed from source/blender/gpu/gawain/immediate.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/primitive.c (renamed from source/blender/gpu/gawain/primitive.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/shader_interface.c (renamed from source/blender/gpu/gawain/shader_interface.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/vertex_buffer.c (renamed from source/blender/gpu/gawain/vertex_buffer.c) | 0 | ||||
-rw-r--r-- | intern/gawain/src/vertex_format.c (renamed from source/blender/gpu/gawain/vertex_format.c) | 0 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 23 | ||||
-rw-r--r-- | source/blender/gpu/GPU_batch.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/GPU_immediate.h | 9 |
27 files changed, 49 insertions, 25 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 43c341c79c7..7b47578cbc7 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -598,6 +598,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_bmesh bf_gpu bf_draw + bf_intern_gawain bf_blenloader bf_blenkernel bf_physics diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index bfe230250ae..af3b9296077 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -33,6 +33,7 @@ add_subdirectory(opencolorio) add_subdirectory(mikktspace) add_subdirectory(glew-mx) add_subdirectory(eigen) +add_subdirectory(gawain) if(WITH_GAMEENGINE_DECKLINK) add_subdirectory(decklink) diff --git a/intern/gawain/CMakeLists.txt b/intern/gawain/CMakeLists.txt new file mode 100644 index 00000000000..99adab851c7 --- /dev/null +++ b/intern/gawain/CMakeLists.txt @@ -0,0 +1,34 @@ + +set(INC gawain) + +set(INC_SYS ${GLEW_INCLUDE_PATH}) + +set(SRC + src/attrib_binding.c + src/batch.c + src/element.c + src/buffer_id.cpp + src/immediate.c + src/imm_util.c + src/primitive.c + src/shader_interface.c + src/vertex_buffer.c + src/vertex_format.c + + gawain/attrib_binding.h + gawain/batch.h + gawain/buffer_id.h + gawain/common.h + gawain/element.h + gawain/immediate.h + gawain/imm_util.h + gawain/primitive.h + gawain/shader_interface.h + gawain/vertex_buffer.h + gawain/vertex_format.h +) + +# remove this when we switch to core profile +add_definitions(-DWITH_GL_PROFILE_COMPAT) + +blender_add_lib(bf_intern_gawain "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/gpu/gawain/attrib_binding.h b/intern/gawain/gawain/attrib_binding.h index 9e2431ca379..9e2431ca379 100644 --- a/source/blender/gpu/gawain/attrib_binding.h +++ b/intern/gawain/gawain/attrib_binding.h diff --git a/source/blender/gpu/gawain/batch.h b/intern/gawain/gawain/batch.h index 189a586f964..189a586f964 100644 --- a/source/blender/gpu/gawain/batch.h +++ b/intern/gawain/gawain/batch.h diff --git a/source/blender/gpu/gawain/buffer_id.h b/intern/gawain/gawain/buffer_id.h index 3f67458d060..3f67458d060 100644 --- a/source/blender/gpu/gawain/buffer_id.h +++ b/intern/gawain/gawain/buffer_id.h diff --git a/source/blender/gpu/gawain/common.h b/intern/gawain/gawain/common.h index a4c1e6cba6e..a4c1e6cba6e 100644 --- a/source/blender/gpu/gawain/common.h +++ b/intern/gawain/gawain/common.h diff --git a/source/blender/gpu/gawain/element.h b/intern/gawain/gawain/element.h index f22d7c0ffda..f22d7c0ffda 100644 --- a/source/blender/gpu/gawain/element.h +++ b/intern/gawain/gawain/element.h diff --git a/source/blender/gpu/gawain/imm_util.h b/intern/gawain/gawain/imm_util.h index 730bd7c1a3c..730bd7c1a3c 100644 --- a/source/blender/gpu/gawain/imm_util.h +++ b/intern/gawain/gawain/imm_util.h diff --git a/source/blender/gpu/gawain/immediate.h b/intern/gawain/gawain/immediate.h index 6a039542065..6a039542065 100644 --- a/source/blender/gpu/gawain/immediate.h +++ b/intern/gawain/gawain/immediate.h diff --git a/source/blender/gpu/gawain/primitive.h b/intern/gawain/gawain/primitive.h index d1b8f5b3ec7..d1b8f5b3ec7 100644 --- a/source/blender/gpu/gawain/primitive.h +++ b/intern/gawain/gawain/primitive.h diff --git a/source/blender/gpu/gawain/shader_interface.h b/intern/gawain/gawain/shader_interface.h index bdb0bbf4a8c..bdb0bbf4a8c 100644 --- a/source/blender/gpu/gawain/shader_interface.h +++ b/intern/gawain/gawain/shader_interface.h diff --git a/source/blender/gpu/gawain/vertex_buffer.h b/intern/gawain/gawain/vertex_buffer.h index 6a72cfe6ff3..6a72cfe6ff3 100644 --- a/source/blender/gpu/gawain/vertex_buffer.h +++ b/intern/gawain/gawain/vertex_buffer.h diff --git a/source/blender/gpu/gawain/vertex_format.h b/intern/gawain/gawain/vertex_format.h index 4ed9e58f376..4ed9e58f376 100644 --- a/source/blender/gpu/gawain/vertex_format.h +++ b/intern/gawain/gawain/vertex_format.h diff --git a/source/blender/gpu/gawain/attrib_binding.c b/intern/gawain/src/attrib_binding.c index bb42aaf66eb..bb42aaf66eb 100644 --- a/source/blender/gpu/gawain/attrib_binding.c +++ b/intern/gawain/src/attrib_binding.c diff --git a/source/blender/gpu/gawain/batch.c b/intern/gawain/src/batch.c index cac34d445bb..cac34d445bb 100644 --- a/source/blender/gpu/gawain/batch.c +++ b/intern/gawain/src/batch.c diff --git a/source/blender/gpu/gawain/buffer_id.cpp b/intern/gawain/src/buffer_id.cpp index 450656c4ebf..450656c4ebf 100644 --- a/source/blender/gpu/gawain/buffer_id.cpp +++ b/intern/gawain/src/buffer_id.cpp diff --git a/source/blender/gpu/gawain/element.c b/intern/gawain/src/element.c index 3c3ca1c7626..3c3ca1c7626 100644 --- a/source/blender/gpu/gawain/element.c +++ b/intern/gawain/src/element.c diff --git a/source/blender/gpu/gawain/imm_util.c b/intern/gawain/src/imm_util.c index 74caeb6fd3a..74caeb6fd3a 100644 --- a/source/blender/gpu/gawain/imm_util.c +++ b/intern/gawain/src/imm_util.c diff --git a/source/blender/gpu/gawain/immediate.c b/intern/gawain/src/immediate.c index f52e9271fe5..f52e9271fe5 100644 --- a/source/blender/gpu/gawain/immediate.c +++ b/intern/gawain/src/immediate.c diff --git a/source/blender/gpu/gawain/primitive.c b/intern/gawain/src/primitive.c index 95472c289e8..95472c289e8 100644 --- a/source/blender/gpu/gawain/primitive.c +++ b/intern/gawain/src/primitive.c diff --git a/source/blender/gpu/gawain/shader_interface.c b/intern/gawain/src/shader_interface.c index 93a1283d895..93a1283d895 100644 --- a/source/blender/gpu/gawain/shader_interface.c +++ b/intern/gawain/src/shader_interface.c diff --git a/source/blender/gpu/gawain/vertex_buffer.c b/intern/gawain/src/vertex_buffer.c index 827703403e3..827703403e3 100644 --- a/source/blender/gpu/gawain/vertex_buffer.c +++ b/intern/gawain/src/vertex_buffer.c diff --git a/source/blender/gpu/gawain/vertex_format.c b/intern/gawain/src/vertex_format.c index d42398f3a4f..d42398f3a4f 100644 --- a/source/blender/gpu/gawain/vertex_format.c +++ b/intern/gawain/src/vertex_format.c diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 391efdaeb00..1791b34d4c8 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -42,6 +42,7 @@ set(INC ../../../intern/glew-mx ../../../intern/guardedalloc ../../../intern/smoke/extern + ../../../intern/gawain ) set(INC_SYS @@ -70,28 +71,6 @@ set(SRC intern/gpu_uniformbuffer.c intern/gpu_viewport.c - gawain/attrib_binding.c - gawain/attrib_binding.h - gawain/batch.c - gawain/batch.h - gawain/buffer_id.h - gawain/buffer_id.cpp - gawain/common.h - gawain/element.c - gawain/element.h - gawain/immediate.c - gawain/immediate.h - gawain/imm_util.c - gawain/imm_util.h - gawain/primitive.h - gawain/primitive.c - gawain/shader_interface.c - gawain/shader_interface.h - gawain/vertex_buffer.c - gawain/vertex_buffer.h - gawain/vertex_format.c - gawain/vertex_format.h - shaders/gpu_shader_fx_lib.glsl shaders/gpu_shader_fx_ssao_frag.glsl shaders/gpu_shader_fx_dof_frag.glsl diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 6d63965952a..2232e333bb6 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -30,7 +30,11 @@ #pragma once -#include "gawain/batch.h" +#include "../../../intern/gawain/gawain/batch.h" + +// TODO: CMake magic to do this: +// #include "gawain/batch.h" + #include "GPU_shader.h" /* Extend Batch_set_program to use Blender’s library of built-in shader programs. */ diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 4a0840e22c0..35964a81030 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -30,8 +30,13 @@ #pragma once -#include "gawain/immediate.h" -#include "gawain/imm_util.h" +#include "../../../intern/gawain/gawain/immediate.h" +#include "../../../intern/gawain/gawain/imm_util.h" + +// TODO: CMake magic to do this: +// #include "gawain/immediate.h" +// #include "gawain/imm_util.h" + #include "GPU_shader.h" /* Extend immBindProgram to use Blender’s library of built-in shader programs. |