Cleanup: GPU: Replace NULL by nullptr from C++ files

10 files changed, 29 insertions, 29 deletions

diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh
index 9cdf0075632..f823a92893c 100644
--- a/source/blender/gpu/intern/gpu_context_private.hh
+++ b/source/blender/gpu/intern/gpu_context_private.hh
@@ -28,11 +28,11 @@ namespace blender::gpu {
 class Context {
  public:
   /** State management */
-  Shader *shader = NULL;
-  FrameBuffer *active_fb = NULL;
-  GPUMatrixState *matrix_state = NULL;
-  StateManager *state_manager = NULL;
-  Immediate *imm = NULL;
+  Shader *shader = nullptr;
+  FrameBuffer *active_fb = nullptr;
+  GPUMatrixState *matrix_state = nullptr;
+  StateManager *state_manager = nullptr;
+  Immediate *imm = nullptr;
 
   /**
    * All 4 window frame-buffers.
@@ -41,10 +41,10 @@ class Context {
    * Front frame-buffers contains (in principle, but not always) the last frame color.
    * Default frame-buffer is back_left.
    */
-  FrameBuffer *back_left = NULL;
-  FrameBuffer *front_left = NULL;
-  FrameBuffer *back_right = NULL;
-  FrameBuffer *front_right = NULL;
+  FrameBuffer *back_left = nullptr;
+  FrameBuffer *front_left = nullptr;
+  FrameBuffer *back_right = nullptr;
+  FrameBuffer *front_right = nullptr;
 
   DebugStack debug_stack;
 
@@ -52,7 +52,7 @@ class Context {
   /** Thread on which this context is active. */
   pthread_t thread_;
   bool is_active_;
-  /** Avoid including GHOST headers. Can be NULL for off-screen contexts. */
+  /** Avoid including GHOST headers. Can be nullptr for off-screen contexts. */
   void *ghost_window_;
 
  public:
diff --git a/source/blender/gpu/intern/gpu_immediate_private.hh b/source/blender/gpu/intern/gpu_immediate_private.hh
index 6c50fa01071..74ebbdc7ae3 100644
--- a/source/blender/gpu/intern/gpu_immediate_private.hh
+++ b/source/blender/gpu/intern/gpu_immediate_private.hh
@@ -19,7 +19,7 @@ namespace blender::gpu {
 class Immediate {
  public:
   /** Pointer to the mapped buffer data for the current vertex. */
-  uchar *vertex_data = NULL;
+  uchar *vertex_data = nullptr;
   /** Current vertex index. */
   uint vertex_idx = 0;
   /** Length of the buffer in vertices. */
@@ -32,12 +32,12 @@ class Immediate {
   /** Current draw call specification. */
   GPUPrimType prim_type = GPU_PRIM_NONE;
   GPUVertFormat vertex_format = {};
-  GPUShader *shader = NULL;
+  GPUShader *shader = nullptr;
   /** Enforce strict vertex count (disabled when using #immBeginAtMost). */
   bool strict_vertex_len = true;
 
   /** Batch in construction when using #immBeginBatch. */
-  GPUBatch *batch = NULL;
+  GPUBatch *batch = nullptr;
 
   /** Wide Line workaround. */
 
diff --git a/source/blender/gpu/intern/gpu_shader_interface.hh b/source/blender/gpu/intern/gpu_shader_interface.hh
index ac78af38fcc..60344757b43 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.hh
+++ b/source/blender/gpu/intern/gpu_shader_interface.hh
@@ -39,9 +39,9 @@ class ShaderInterface {
   /* TODO(fclem): should be protected. */
  public:
   /** Flat array. In this order: Attributes, Ubos, Uniforms. */
-  ShaderInput *inputs_ = NULL;
+  ShaderInput *inputs_ = nullptr;
   /** Buffer containing all inputs names separated by '\0'. */
-  char *name_buffer_ = NULL;
+  char *name_buffer_ = nullptr;
   /** Input counts inside input array. */
   uint attr_len_ = 0;
   uint ubo_len_ = 0;
@@ -187,7 +187,7 @@ inline const char *ShaderInterface::builtin_uniform_name(GPUUniformBuiltin u)
       return "srgbTarget";
 
     default:
-      return NULL;
+      return nullptr;
   }
 }
 
@@ -208,7 +208,7 @@ inline const char *ShaderInterface::builtin_uniform_block_name(GPUUniformBlockBu
     case GPU_UNIFORM_BLOCK_DRW_INFOS:
       return "drw_infos";
     default:
-      return NULL;
+      return nullptr;
   }
 }
 
@@ -258,7 +258,7 @@ inline const ShaderInput *ShaderInterface::input_lookup(const ShaderInput *const
             return inputs + i; /* not found */
           }
         }
-        return NULL; /* not found */
+        return nullptr; /* not found */
       }
 
       /* This is a bit dangerous since we could have a hash collision.
@@ -268,7 +268,7 @@ inline const ShaderInput *ShaderInterface::input_lookup(const ShaderInput *const
       return inputs + i;
     }
   }
-  return NULL; /* not found */
+  return nullptr; /* not found */
 }
 
 inline const ShaderInput *ShaderInterface::input_lookup(const ShaderInput *const inputs,
@@ -281,7 +281,7 @@ inline const ShaderInput *ShaderInterface::input_lookup(const ShaderInput *const
       return inputs + i;
     }
   }
-  return NULL; /* not found */
+  return nullptr; /* not found */
 }
 
 }  // namespace blender::gpu
diff --git a/source/blender/gpu/intern/gpu_storage_buffer_private.hh b/source/blender/gpu/intern/gpu_storage_buffer_private.hh
index 091e6c2d386..9baec0c2a77 100644
--- a/source/blender/gpu/intern/gpu_storage_buffer_private.hh
+++ b/source/blender/gpu/intern/gpu_storage_buffer_private.hh
@@ -29,7 +29,7 @@ class StorageBuf {
   /** Data size in bytes. */
   size_t size_in_bytes_;
   /** Continuous memory block to copy to GPU. This data is owned by the StorageBuf. */
-  void *data_ = NULL;
+  void *data_ = nullptr;
   /** Debugging name */
   char name_[DEBUG_NAME_LEN];
 
diff --git a/source/blender/gpu/intern/gpu_uniform_buffer_private.hh b/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
index 6e3285b6fef..e3d70634ce1 100644
--- a/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
+++ b/source/blender/gpu/intern/gpu_uniform_buffer_private.hh
@@ -29,7 +29,7 @@ class UniformBuf {
   /** Data size in bytes. */
   size_t size_in_bytes_;
   /** Continuous memory block to copy to GPU. This data is owned by the UniformBuf. */
-  void *data_ = NULL;
+  void *data_ = nullptr;
   /** Debugging name */
   char name_[DEBUG_NAME_LEN];
 
diff --git a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
index 7a0b53cf958..a7920bacaec 100644
--- a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
+++ b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
@@ -29,7 +29,7 @@ class VertBuf {
   /** Status flag. */
   GPUVertBufStatus flag = GPU_VERTBUF_INVALID;
   /** NULL indicates data in VRAM (unmapped) */
-  uchar *data = NULL;
+  uchar *data = nullptr;
 
  protected:
   /** Usage hint for GL optimization. */
diff --git a/source/blender/gpu/opengl/gl_batch.hh b/source/blender/gpu/opengl/gl_batch.hh
index a25e495b3b1..1a18572c683 100644
--- a/source/blender/gpu/opengl/gl_batch.hh
+++ b/source/blender/gpu/opengl/gl_batch.hh
@@ -35,9 +35,9 @@ class GLShaderInterface;
 class GLVaoCache {
  private:
   /** Context for which the vao_cache_ was generated. */
-  GLContext *context_ = NULL;
+  GLContext *context_ = nullptr;
   /** Last interface this batch was drawn with. */
-  GLShaderInterface *interface_ = NULL;
+  GLShaderInterface *interface_ = nullptr;
   /** Cached VAO for the last interface. */
   GLuint vao_id_ = 0;
   /** Used when arb_base_instance is not supported. */
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc
index f82138e0d65..79b28642a67 100644
--- a/source/blender/gpu/opengl/gl_debug.cc
+++ b/source/blender/gpu/opengl/gl_debug.cc
@@ -189,7 +189,7 @@ void check_gl_error(const char *info)
   case err: { \
     char msg[256]; \
     SNPRINTF(msg, "%s : %s", #err, info); \
-    debug_callback(0, GL_DEBUG_TYPE_ERROR, 0, GL_DEBUG_SEVERITY_HIGH, 0, msg, NULL); \
+    debug_callback(0, GL_DEBUG_TYPE_ERROR, 0, GL_DEBUG_SEVERITY_HIGH, 0, msg, nullptr); \
     break; \
   }
 
diff --git a/source/blender/gpu/opengl/gl_framebuffer.hh b/source/blender/gpu/opengl/gl_framebuffer.hh
index 224c7a92c0a..2dc0936d0fe 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.hh
+++ b/source/blender/gpu/opengl/gl_framebuffer.hh
@@ -30,9 +30,9 @@ class GLFrameBuffer : public FrameBuffer {
   /** OpenGL handle. */
   GLuint fbo_id_ = 0;
   /** Context the handle is from. Frame-buffers are not shared across contexts. */
-  GLContext *context_ = NULL;
+  GLContext *context_ = nullptr;
   /** State Manager of the same contexts. */
-  GLStateManager *state_manager_ = NULL;
+  GLStateManager *state_manager_ = nullptr;
   /** Copy of the GL state. Contains ONLY color attachments enums for slot binding. */
   GLenum gl_attachments_[GPU_FB_MAX_COLOR_ATTACHMENT];
   /** Internal frame-buffers are immutable. */
diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh
index e5b879f1f15..aeb9fc0e6b7 100644
--- a/source/blender/gpu/opengl/gl_texture.hh
+++ b/source/blender/gpu/opengl/gl_texture.hh
@@ -33,7 +33,7 @@ class GLTexture : public Texture {
   /** opengl identifier for texture. */
   GLuint tex_id_ = 0;
   /** Legacy workaround for texture copy. Created when using framebuffer_get(). */
-  struct GPUFrameBuffer *framebuffer_ = NULL;
+  struct GPUFrameBuffer *framebuffer_ = nullptr;
   /** True if this texture is bound to at least one texture unit. */
   /* TODO(fclem): How do we ensure thread safety here? */
   bool is_bound_ = false;