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:
authorJacques Lucke <jacques@blender.org>2021-04-08 12:07:12 +0300
committerJacques Lucke <jacques@blender.org>2021-04-08 12:07:27 +0300
commit19dfb6ea1f6745c0dbc2ce21839c30184b553878 (patch)
tree4deac8e505cf2f422ab20d132395d006dddb29c3 /source/blender/gpu
parent0ea66039dd5374e23e9e60e8e3192f919d4f1abd (diff)
Cleanup: enable modernize-use-equals-default check
This removes a lot of unnecessary code that is generated by the compiler automatically. In very few cases, a defaulted destructor in a .cc file is still necessary, because of forward declarations in the header. I removed some defaulted virtual destructors, because they are not necessary, when the parent class has a virtual destructor already. Defaulted constructors are only necessary when there is another constructor, but the class should still be default constructible. Differential Revision: https://developer.blender.org/D10911
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_batch_private.hh3
-rw-r--r--source/blender/gpu/intern/gpu_shader_interface.cc6
-rw-r--r--source/blender/gpu/opengl/gl_batch.cc14
-rw-r--r--source/blender/gpu/opengl/gl_batch.hh3
4 files changed, 3 insertions, 23 deletions
diff --git a/source/blender/gpu/intern/gpu_batch_private.hh b/source/blender/gpu/intern/gpu_batch_private.hh
index d0fbd1432b3..eed96864f20 100644
--- a/source/blender/gpu/intern/gpu_batch_private.hh
+++ b/source/blender/gpu/intern/gpu_batch_private.hh
@@ -42,8 +42,7 @@ namespace gpu {
*/
class Batch : public GPUBatch {
public:
- Batch(){};
- virtual ~Batch(){};
+ virtual ~Batch() = default;
virtual void draw(int v_first, int v_count, int i_first, int i_count) = 0;
diff --git a/source/blender/gpu/intern/gpu_shader_interface.cc b/source/blender/gpu/intern/gpu_shader_interface.cc
index 81c1e013877..c584c40eca8 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.cc
+++ b/source/blender/gpu/intern/gpu_shader_interface.cc
@@ -32,10 +32,8 @@
namespace blender::gpu {
-ShaderInterface::ShaderInterface()
-{
- /* TODO(fclem): add unique ID for debugging. */
-}
+/* TODO(fclem): add unique ID for debugging. */
+ShaderInterface::ShaderInterface() = default;
ShaderInterface::~ShaderInterface()
{
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc
index 321d9552828..976a31ab5cb 100644
--- a/source/blender/gpu/opengl/gl_batch.cc
+++ b/source/blender/gpu/opengl/gl_batch.cc
@@ -279,20 +279,6 @@ GLuint GLVaoCache::vao_get(GPUBatch *batch)
/** \} */
/* -------------------------------------------------------------------- */
-/** \name Creation & Deletion
- * \{ */
-
-GLBatch::GLBatch()
-{
-}
-
-GLBatch::~GLBatch()
-{
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
/** \name Drawing
* \{ */
diff --git a/source/blender/gpu/opengl/gl_batch.hh b/source/blender/gpu/opengl/gl_batch.hh
index 218b9ffe4b7..444ae1c0ab1 100644
--- a/source/blender/gpu/opengl/gl_batch.hh
+++ b/source/blender/gpu/opengl/gl_batch.hh
@@ -96,9 +96,6 @@ class GLBatch : public Batch {
GLVaoCache vao_cache_;
public:
- GLBatch();
- ~GLBatch();
-
void draw(int v_first, int v_count, int i_first, int i_count) override;
void bind(int i_first);