Commit: b6308d79e59dfe52ce425541cc07ec90a430a635
Author: Campbell Barton
Date: Wed Aug 16 00:20:14 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBb6308d79e59dfe52ce425541cc07ec90a430a635
Cleanup: use 'gwn' prefix for gawain filenames
Looking up names project wide or setting breakpoints wasn't so.
Names like common.h or element.h are also too generic.
===================================================================
M intern/gawain/CMakeLists.txt
R095 intern/gawain/gawain/attrib_binding.h
intern/gawain/gawain/gwn_attr_binding.h
R090 intern/gawain/gawain/attrib_binding_private.h
intern/gawain/gawain/gwn_attr_binding_private.h
R097 intern/gawain/gawain/batch.h intern/gawain/gawain/gwn_batch.h
R096 intern/gawain/gawain/buffer_id.h
intern/gawain/gawain/gwn_buffer_id.h
R100 intern/gawain/gawain/common.h intern/gawain/gawain/gwn_common.h
R098 intern/gawain/gawain/element.h intern/gawain/gawain/gwn_element.h
R100 intern/gawain/gawain/imm_util.h intern/gawain/gawain/gwn_imm_util.h
R097 intern/gawain/gawain/immediate.h
intern/gawain/gawain/gwn_immediate.h
R097 intern/gawain/gawain/primitive.h
intern/gawain/gawain/gwn_primitive.h
R100 intern/gawain/gawain/primitive_private.h
intern/gawain/gawain/gwn_primitive_private.h
R098 intern/gawain/gawain/shader_interface.h
intern/gawain/gawain/gwn_shader_interface.h
R099 intern/gawain/gawain/vertex_buffer.h
intern/gawain/gawain/gwn_vertex_buffer.h
R098 intern/gawain/gawain/vertex_format.h
intern/gawain/gawain/gwn_vertex_format.h
R100 intern/gawain/gawain/vertex_format_private.h
intern/gawain/gawain/gwn_vertex_format_private.h
R096 intern/gawain/src/attrib_binding.c
intern/gawain/src/gwn_attr_binding.c
R099 intern/gawain/src/batch.c intern/gawain/src/gwn_batch.c
R098 intern/gawain/src/buffer_id.cpp intern/gawain/src/gwn_buffer_id.cpp
R099 intern/gawain/src/element.c intern/gawain/src/gwn_element.c
R095 intern/gawain/src/imm_util.c intern/gawain/src/gwn_imm_util.c
R099 intern/gawain/src/immediate.c intern/gawain/src/gwn_immediate.c
R096 intern/gawain/src/primitive.c intern/gawain/src/gwn_primitive.c
R099 intern/gawain/src/shader_interface.c
intern/gawain/src/gwn_shader_interface.c
R098 intern/gawain/src/vertex_buffer.c
intern/gawain/src/gwn_vertex_buffer.c
R099 intern/gawain/src/vertex_format.c
intern/gawain/src/gwn_vertex_format.c
M source/blender/gpu/GPU_batch.h
M source/blender/gpu/GPU_immediate.h
M source/blender/gpu/GPU_matrix.h
M source/blender/gpu/intern/gpu_shader_private.h
===================================================================
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
similarity index 95%
rename from intern/gawain/gawain/attrib_binding.h
rename to 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
similarity index 90%
rename from intern/gawain/gawain/attrib_binding_private.h
rename to 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
similarity index 97%
rename from intern/gawain/gawain/batch.h
rename to 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
similarity index 96%
rename from intern/gawain/gawain/buffer_id.h
rename to 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
similarity index 100%
rename from intern/gawain/gawain/common.h
rename to intern/gawain/gawain/gwn_common.h
diff --git a/intern/gawain/gawain/element.h b/intern/gawain/gawain/gwn_element.h
similarity index 98%
rename from intern/gawain/gawain/element.h
rename to 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
similarity index 100%
rename from intern/gawain/gawain/imm_util.h
rename to intern/gawain/gawain/gwn_imm_util.h
diff --git a/intern/gawain/gawain/immediate.h
b/intern/gawain/gawain/gwn_immediate.h
similarity index 97%
rename from intern/gawain/gawain/immediate.h
rename to 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
similarity index 97%
rename from intern/gawain/gawain/primitive.h
rename to 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
similarity index 100%
rename from intern/gawain/gawain/primitive_private.h
rename to intern/gawain/gawain/gwn_primitive_private.h
diff --git a/intern/gawain/gawain/shader_interface.h
b/intern/gawain/gawain/gwn_shader_interface.h
similarity index 98%
rename from intern/gawain/gawain/shader_interface.h
rename to 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
similarity index 99%
rename from intern/gawain/gawain/vertex_buffer.h
rename to 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
similarity index 98%
rename from intern/gawain/gawain/vertex_format.h
rename to 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
similarity index 100%
rename from intern/gawain/gawain/vertex_format_private.h
rename to 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
similarity index 96%
rename from intern/gawain/src/attrib_binding.c
rename to 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
similarity index 99%
rename from intern/gawain/src/batch.c
rename to 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
similarity index 98%
rename from intern/gawain/src/buffer_id.cpp
rename to 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
similarity index 99%
rename from intern/gawain/src/element.c
rename to 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 For
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
