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.

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})

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

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*);
 

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,

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);

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
 

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.

intern/gawain/gawain/gwn_primitive.h

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "gwn_common.h"
 
 typedef enum {
 	GWN_PRIM_POINTS,

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

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)

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

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

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

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>
 

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

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)

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

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)
 	{

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>

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>
 

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>
 

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"

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"
 

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" {

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) */