diff options
-rw-r--r-- | intern/gawain/CMakeLists.txt | 48 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_attr_binding.h (renamed from intern/gawain/gawain/attrib_binding.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_attr_binding_private.h (renamed from intern/gawain/gawain/attrib_binding_private.h) | 4 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_batch.h (renamed from intern/gawain/gawain/batch.h) | 6 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_buffer_id.h (renamed from intern/gawain/gawain/buffer_id.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_common.h (renamed from intern/gawain/gawain/common.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_element.h (renamed from intern/gawain/gawain/element.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_imm_util.h (renamed from intern/gawain/gawain/imm_util.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_immediate.h (renamed from intern/gawain/gawain/immediate.h) | 8 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_primitive.h (renamed from intern/gawain/gawain/primitive.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_primitive_private.h (renamed from intern/gawain/gawain/primitive_private.h) | 0 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_shader_interface.h (renamed from intern/gawain/gawain/shader_interface.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_vertex_buffer.h (renamed from intern/gawain/gawain/vertex_buffer.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_vertex_format.h (renamed from intern/gawain/gawain/vertex_format.h) | 2 | ||||
-rw-r--r-- | intern/gawain/gawain/gwn_vertex_format_private.h (renamed from intern/gawain/gawain/vertex_format_private.h) | 0 | ||||
-rw-r--r-- | intern/gawain/src/gwn_attr_binding.c (renamed from intern/gawain/src/attrib_binding.c) | 4 | ||||
-rw-r--r-- | intern/gawain/src/gwn_batch.c (renamed from intern/gawain/src/batch.c) | 6 | ||||
-rw-r--r-- | intern/gawain/src/gwn_buffer_id.cpp (renamed from intern/gawain/src/buffer_id.cpp) | 2 | ||||
-rw-r--r-- | intern/gawain/src/gwn_element.c (renamed from intern/gawain/src/element.c) | 4 | ||||
-rw-r--r-- | intern/gawain/src/gwn_imm_util.c (renamed from intern/gawain/src/imm_util.c) | 4 | ||||
-rw-r--r-- | intern/gawain/src/gwn_immediate.c (renamed from intern/gawain/src/immediate.c) | 12 | ||||
-rw-r--r-- | intern/gawain/src/gwn_primitive.c (renamed from intern/gawain/src/primitive.c) | 4 | ||||
-rw-r--r-- | intern/gawain/src/gwn_shader_interface.c (renamed from intern/gawain/src/shader_interface.c) | 2 | ||||
-rw-r--r-- | intern/gawain/src/gwn_vertex_buffer.c (renamed from intern/gawain/src/vertex_buffer.c) | 6 | ||||
-rw-r--r-- | intern/gawain/src/gwn_vertex_format.c (renamed from intern/gawain/src/vertex_format.c) | 4 | ||||
-rw-r--r-- | source/blender/gpu/GPU_batch.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_immediate.h | 8 | ||||
-rw-r--r-- | source/blender/gpu/GPU_matrix.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_shader_private.h | 2 |
29 files changed, 71 insertions, 71 deletions
diff --git a/intern/gawain/CMakeLists.txt b/intern/gawain/CMakeLists.txt index 48392012176..9924daa8cd1 100644 --- a/intern/gawain/CMakeLists.txt +++ b/intern/gawain/CMakeLists.txt @@ -8,31 +8,31 @@ set(INC_SYS ) 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 + src/gwn_attr_binding.c + src/gwn_batch.c + src/gwn_element.c + src/gwn_buffer_id.cpp + src/gwn_immediate.c + src/gwn_imm_util.c + src/gwn_primitive.c + src/gwn_shader_interface.c + src/gwn_vertex_buffer.c + src/gwn_vertex_format.c - gawain/attrib_binding.h - gawain/attrib_binding_private.h - gawain/batch.h - gawain/buffer_id.h - gawain/common.h - gawain/element.h - gawain/imm_util.h - gawain/immediate.h - gawain/primitive.h - gawain/primitive_private.h - gawain/shader_interface.h - gawain/vertex_buffer.h - gawain/vertex_format.h - gawain/vertex_format_private.h + gawain/gwn_attr_binding.h + gawain/gwn_attr_binding_private.h + gawain/gwn_batch.h + gawain/gwn_buffer_id.h + gawain/gwn_common.h + gawain/gwn_element.h + gawain/gwn_imm_util.h + gawain/gwn_immediate.h + gawain/gwn_primitive.h + gawain/gwn_primitive_private.h + gawain/gwn_shader_interface.h + gawain/gwn_vertex_buffer.h + gawain/gwn_vertex_format.h + gawain/gwn_vertex_format_private.h ) add_definitions(${GL_DEFINITIONS}) diff --git a/intern/gawain/gawain/attrib_binding.h b/intern/gawain/gawain/gwn_attr_binding.h index a254f05dc05..e8c46696b7c 100644 --- a/intern/gawain/gawain/attrib_binding.h +++ b/intern/gawain/gawain/gwn_attr_binding.h @@ -11,7 +11,7 @@ #pragma once -#include "common.h" +#include "gwn_common.h" typedef struct { uint64_t loc_bits; // store 4 bits for each of the 16 attribs diff --git a/intern/gawain/gawain/attrib_binding_private.h b/intern/gawain/gawain/gwn_attr_binding_private.h index 53fdecff9ce..300945d464b 100644 --- a/intern/gawain/gawain/attrib_binding_private.h +++ b/intern/gawain/gawain/gwn_attr_binding_private.h @@ -11,8 +11,8 @@ #pragma once -#include "vertex_format.h" -#include "shader_interface.h" +#include "gwn_vertex_format.h" +#include "gwn_shader_interface.h" void AttribBinding_clear(Gwn_AttrBinding*); diff --git a/intern/gawain/gawain/batch.h b/intern/gawain/gawain/gwn_batch.h index 6e2f32c1996..0667cfd751e 100644 --- a/intern/gawain/gawain/batch.h +++ b/intern/gawain/gawain/gwn_batch.h @@ -11,9 +11,9 @@ #pragma once -#include "vertex_buffer.h" -#include "element.h" -#include "shader_interface.h" +#include "gwn_vertex_buffer.h" +#include "gwn_element.h" +#include "gwn_shader_interface.h" typedef enum { GWN_BATCH_READY_TO_FORMAT, diff --git a/intern/gawain/gawain/buffer_id.h b/intern/gawain/gawain/gwn_buffer_id.h index e978eec67d8..db5df99f526 100644 --- a/intern/gawain/gawain/buffer_id.h +++ b/intern/gawain/gawain/gwn_buffer_id.h @@ -20,7 +20,7 @@ extern "C" { #endif -#include "common.h" +#include "gwn_common.h" GLuint GWN_buf_id_alloc(void); void GWN_buf_id_free(GLuint buffer_id); diff --git a/intern/gawain/gawain/common.h b/intern/gawain/gawain/gwn_common.h index e96a3b5c2a2..e96a3b5c2a2 100644 --- a/intern/gawain/gawain/common.h +++ b/intern/gawain/gawain/gwn_common.h diff --git a/intern/gawain/gawain/element.h b/intern/gawain/gawain/gwn_element.h index 771462be7c5..2f7e22fe2d1 100644 --- a/intern/gawain/gawain/element.h +++ b/intern/gawain/gawain/gwn_element.h @@ -11,7 +11,7 @@ #pragma once -#include "primitive.h" +#include "gwn_primitive.h" #define GWN_TRACK_INDEX_RANGE 1 diff --git a/intern/gawain/gawain/imm_util.h b/intern/gawain/gawain/gwn_imm_util.h index 730bd7c1a3c..730bd7c1a3c 100644 --- a/intern/gawain/gawain/imm_util.h +++ b/intern/gawain/gawain/gwn_imm_util.h diff --git a/intern/gawain/gawain/immediate.h b/intern/gawain/gawain/gwn_immediate.h index 39ba76db931..386b26b63b1 100644 --- a/intern/gawain/gawain/immediate.h +++ b/intern/gawain/gawain/gwn_immediate.h @@ -11,9 +11,9 @@ #pragma once -#include "vertex_format.h" -#include "primitive.h" -#include "shader_interface.h" +#include "gwn_vertex_format.h" +#include "gwn_primitive.h" +#include "gwn_shader_interface.h" #define IMM_BATCH_COMBO 1 @@ -28,7 +28,7 @@ void immBeginAtMost(Gwn_PrimType, unsigned max_vertex_ct); // can supply fewer v void immEnd(void); // finishes and draws #if IMM_BATCH_COMBO -#include "batch.h" +#include "gwn_batch.h" // immBegin a batch, then use standard immFunctions as usual. // immEnd will finalize the batch instead of drawing. // Then you can draw it as many times as you like! Partially replaces the need for display lists. diff --git a/intern/gawain/gawain/primitive.h b/intern/gawain/gawain/gwn_primitive.h index c6786dc1993..5e5b8019889 100644 --- a/intern/gawain/gawain/primitive.h +++ b/intern/gawain/gawain/gwn_primitive.h @@ -11,7 +11,7 @@ #pragma once -#include "common.h" +#include "gwn_common.h" typedef enum { GWN_PRIM_POINTS, diff --git a/intern/gawain/gawain/primitive_private.h b/intern/gawain/gawain/gwn_primitive_private.h index d959cd89852..d959cd89852 100644 --- a/intern/gawain/gawain/primitive_private.h +++ b/intern/gawain/gawain/gwn_primitive_private.h diff --git a/intern/gawain/gawain/shader_interface.h b/intern/gawain/gawain/gwn_shader_interface.h index 5304cc9fa51..61bdd05d5e0 100644 --- a/intern/gawain/gawain/shader_interface.h +++ b/intern/gawain/gawain/gwn_shader_interface.h @@ -11,7 +11,7 @@ #pragma once -#include "common.h" +#include "gwn_common.h" typedef enum { GWN_UNIFORM_NONE, // uninitialized/unknown diff --git a/intern/gawain/gawain/vertex_buffer.h b/intern/gawain/gawain/gwn_vertex_buffer.h index 9aee8e05877..d068fba855a 100644 --- a/intern/gawain/gawain/vertex_buffer.h +++ b/intern/gawain/gawain/gwn_vertex_buffer.h @@ -11,7 +11,7 @@ #pragma once -#include "vertex_format.h" +#include "gwn_vertex_format.h" // How to create a Gwn_VertBuf: // 1) verts = GWN_vertbuf_create() or GWN_vertbuf_init(verts) diff --git a/intern/gawain/gawain/vertex_format.h b/intern/gawain/gawain/gwn_vertex_format.h index ab61722db60..4b867ecbb45 100644 --- a/intern/gawain/gawain/vertex_format.h +++ b/intern/gawain/gawain/gwn_vertex_format.h @@ -11,7 +11,7 @@ #pragma once -#include "common.h" +#include "gwn_common.h" #define GWN_VERT_ATTR_MAX_LEN 16 #define MAX_ATTRIB_NAMES 3 diff --git a/intern/gawain/gawain/vertex_format_private.h b/intern/gawain/gawain/gwn_vertex_format_private.h index c1a0f734eda..c1a0f734eda 100644 --- a/intern/gawain/gawain/vertex_format_private.h +++ b/intern/gawain/gawain/gwn_vertex_format_private.h diff --git a/intern/gawain/src/attrib_binding.c b/intern/gawain/src/gwn_attr_binding.c index 6cdb8a0e542..7647a927b1e 100644 --- a/intern/gawain/src/attrib_binding.c +++ b/intern/gawain/src/gwn_attr_binding.c @@ -9,8 +9,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "attrib_binding.h" -#include "attrib_binding_private.h" +#include "gwn_attr_binding.h" +#include "gwn_attr_binding_private.h" #include <stddef.h> #if GWN_VERT_ATTR_MAX_LEN != 16 diff --git a/intern/gawain/src/batch.c b/intern/gawain/src/gwn_batch.c index 22a5aab48b4..b4e0632377d 100644 --- a/intern/gawain/src/batch.c +++ b/intern/gawain/src/gwn_batch.c @@ -9,9 +9,9 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "batch.h" -#include "buffer_id.h" -#include "primitive_private.h" +#include "gwn_batch.h" +#include "gwn_buffer_id.h" +#include "gwn_primitive_private.h" #include <stdlib.h> // necessary functions from matrix API diff --git a/intern/gawain/src/buffer_id.cpp b/intern/gawain/src/gwn_buffer_id.cpp index 59a6b9c89e7..a93c3950d29 100644 --- a/intern/gawain/src/buffer_id.cpp +++ b/intern/gawain/src/gwn_buffer_id.cpp @@ -9,7 +9,7 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.#include "buffer_id.h" -#include "buffer_id.h" +#include "gwn_buffer_id.h" #include <mutex> #include <vector> diff --git a/intern/gawain/src/element.c b/intern/gawain/src/gwn_element.c index ecf555fbfe8..f31b64fa232 100644 --- a/intern/gawain/src/element.c +++ b/intern/gawain/src/gwn_element.c @@ -9,8 +9,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "element.h" -#include "buffer_id.h" +#include "gwn_element.h" +#include "gwn_buffer_id.h" #include <stdlib.h> #define KEEP_SINGLE_COPY 1 diff --git a/intern/gawain/src/imm_util.c b/intern/gawain/src/gwn_imm_util.c index b06778c9045..45d8a7036e8 100644 --- a/intern/gawain/src/imm_util.c +++ b/intern/gawain/src/gwn_imm_util.c @@ -9,8 +9,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "imm_util.h" -#include "immediate.h" +#include "gwn_imm_util.h" +#include "gwn_immediate.h" void immRectf(unsigned pos, float x1, float y1, float x2, float y2) diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/gwn_immediate.c index 5eb5ebb8336..1c0776d1bbf 100644 --- a/intern/gawain/src/immediate.c +++ b/intern/gawain/src/gwn_immediate.c @@ -9,12 +9,12 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "immediate.h" -#include "buffer_id.h" -#include "attrib_binding.h" -#include "attrib_binding_private.h" -#include "vertex_format_private.h" -#include "primitive_private.h" +#include "gwn_immediate.h" +#include "gwn_buffer_id.h" +#include "gwn_attr_binding.h" +#include "gwn_attr_binding_private.h" +#include "gwn_vertex_format_private.h" +#include "gwn_primitive_private.h" #include <string.h> // necessary functions from matrix API diff --git a/intern/gawain/src/primitive.c b/intern/gawain/src/gwn_primitive.c index b9d92a6bdf8..b206b3ae1b3 100644 --- a/intern/gawain/src/primitive.c +++ b/intern/gawain/src/gwn_primitive.c @@ -9,8 +9,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "primitive.h" -#include "primitive_private.h" +#include "gwn_primitive.h" +#include "gwn_primitive_private.h" Gwn_PrimClass GWN_primtype_class(Gwn_PrimType prim_type) { diff --git a/intern/gawain/src/shader_interface.c b/intern/gawain/src/gwn_shader_interface.c index dff2c06f531..e06fde6ad14 100644 --- a/intern/gawain/src/shader_interface.c +++ b/intern/gawain/src/gwn_shader_interface.c @@ -9,7 +9,7 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "shader_interface.h" +#include "gwn_shader_interface.h" #include <stdlib.h> #include <stddef.h> #include <string.h> diff --git a/intern/gawain/src/vertex_buffer.c b/intern/gawain/src/gwn_vertex_buffer.c index 364e16a1a68..2019d7d50bc 100644 --- a/intern/gawain/src/vertex_buffer.c +++ b/intern/gawain/src/gwn_vertex_buffer.c @@ -9,9 +9,9 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "vertex_buffer.h" -#include "buffer_id.h" -#include "vertex_format_private.h" +#include "gwn_vertex_buffer.h" +#include "gwn_buffer_id.h" +#include "gwn_vertex_format_private.h" #include <stdlib.h> #include <string.h> diff --git a/intern/gawain/src/vertex_format.c b/intern/gawain/src/gwn_vertex_format.c index 34704db3359..d6367935703 100644 --- a/intern/gawain/src/vertex_format.c +++ b/intern/gawain/src/gwn_vertex_format.c @@ -9,8 +9,8 @@ // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of // the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include "vertex_format.h" -#include "vertex_format_private.h" +#include "gwn_vertex_format.h" +#include "gwn_vertex_format_private.h" #include <stddef.h> #include <string.h> diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index d052a2d831f..966690c19b2 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -31,7 +31,7 @@ #ifndef __GPU_BATCH_H__ #define __GPU_BATCH_H__ -#include "../../../intern/gawain/gawain/batch.h" +#include "../../../intern/gawain/gawain/gwn_batch.h" // TODO: CMake magic to do this: // #include "gawain/batch.h" diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 2eb4eb94f48..6206e973908 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -31,12 +31,12 @@ #ifndef __GPU_IMMEDIATE_H__ #define __GPU_IMMEDIATE_H__ -#include "../../../intern/gawain/gawain/immediate.h" -#include "../../../intern/gawain/gawain/imm_util.h" +#include "../../../intern/gawain/gawain/gwn_immediate.h" +#include "../../../intern/gawain/gawain/gwn_imm_util.h" // TODO: CMake magic to do this: -// #include "gawain/immediate.h" -// #include "gawain/imm_util.h" +// #include "gawain/gwn_immediate.h" +// #include "gawain/gwn_imm_util.h" #include "GPU_shader.h" diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h index a3fd75b662b..b2e18de3b84 100644 --- a/source/blender/gpu/GPU_matrix.h +++ b/source/blender/gpu/GPU_matrix.h @@ -34,7 +34,7 @@ #include "BLI_sys_types.h" #include "GPU_glew.h" -#include "../../../intern/gawain/gawain/shader_interface.h" +#include "../../../intern/gawain/gawain/gwn_shader_interface.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/intern/gpu_shader_private.h b/source/blender/gpu/intern/gpu_shader_private.h index 2de05b5746b..f883773df17 100644 --- a/source/blender/gpu/intern/gpu_shader_private.h +++ b/source/blender/gpu/intern/gpu_shader_private.h @@ -26,7 +26,7 @@ #define __GPU_SHADER_PRIVATE_H__ #include "GPU_glew.h" -#include "gawain/shader_interface.h" +#include "gawain/gwn_shader_interface.h" struct GPUShader { GLuint program; /* handle for full program (links shader stages below) */ |