Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-12-04 14:46:43 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-12-04 14:46:43 +0300
commit7f2d356a672d838c90cf47e9ff4006b15c104148 (patch)
treea87f8056750bc810f1430d03c14e8c93e170f3fd /source/blender/gpu
parent10a8286a267d1796983f321dd01668d6072570ed (diff)
Cleanup: Clang-Tidy, modernize-use-using
Replace `typedef` with `using` in C++ code. In the case of `typedef struct SomeName { ... } SomeName;` I removed the `typedef` altogether, as this is unnecessary in C++. Such cases have been rewritten to `struct SomeName { ... };` No functional changes.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_matrix.cc12
-rw-r--r--source/blender/gpu/intern/gpu_select_sample_query.cc4
-rw-r--r--source/blender/gpu/opengl/gl_drawlist.cc8
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/gpu/intern/gpu_matrix.cc b/source/blender/gpu/intern/gpu_matrix.cc
index dae56e39db6..4ccb28fedbd 100644
--- a/source/blender/gpu/intern/gpu_matrix.cc
+++ b/source/blender/gpu/intern/gpu_matrix.cc
@@ -39,15 +39,15 @@ using namespace blender::gpu;
#define MATRIX_STACK_DEPTH 32
-typedef float Mat4[4][4];
-typedef float Mat3[3][3];
+using Mat4 = float[4][4];
+using Mat3 = float[3][3];
-typedef struct MatrixStack {
+struct MatrixStack {
Mat4 stack[MATRIX_STACK_DEPTH];
uint top;
-} MatrixStack;
+};
-typedef struct GPUMatrixState {
+struct GPUMatrixState {
MatrixStack model_view_stack;
MatrixStack projection_stack;
@@ -59,7 +59,7 @@ typedef struct GPUMatrixState {
* TODO: separate Model from View transform? Batches/objects have model,
* camera/eye has view & projection
*/
-} GPUMatrixState;
+};
#define ModelViewStack Context::get()->matrix_state->model_view_stack
#define ModelView ModelViewStack.stack[ModelViewStack.top]
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.cc b/source/blender/gpu/intern/gpu_select_sample_query.cc
index 74506232655..5d8689c0d6a 100644
--- a/source/blender/gpu/intern/gpu_select_sample_query.cc
+++ b/source/blender/gpu/intern/gpu_select_sample_query.cc
@@ -47,7 +47,7 @@
using namespace blender;
using namespace blender::gpu;
-typedef struct GPUSelectQueryState {
+struct GPUSelectQueryState {
/* Tracks whether a query has been issued so that gpu_load_id can end the previous one */
bool query_issued;
/* GPU queries abstraction. Contains an array of queries. */
@@ -68,7 +68,7 @@ typedef struct GPUSelectQueryState {
int scissor[4];
eGPUWriteMask write_mask;
eGPUDepthTest depth_test;
-} GPUSelectQueryState;
+};
static GPUSelectQueryState g_query_state = {false};
diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc
index c374a7bdc9d..f0a18deafd3 100644
--- a/source/blender/gpu/opengl/gl_drawlist.cc
+++ b/source/blender/gpu/opengl/gl_drawlist.cc
@@ -43,20 +43,20 @@
using namespace blender::gpu;
-typedef struct GLDrawCommand {
+struct GLDrawCommand {
GLuint v_count;
GLuint i_count;
GLuint v_first;
GLuint i_first;
-} GLDrawCommand;
+};
-typedef struct GLDrawCommandIndexed {
+struct GLDrawCommandIndexed {
GLuint v_count;
GLuint i_count;
GLuint v_first;
GLuint base_index;
GLuint i_first;
-} GLDrawCommandIndexed;
+};
#define MDI_ENABLED (buffer_size_ != 0)
#define MDI_DISABLED (buffer_size_ == 0)