From 8d2fcf38025cfc98885bc3892aa1ed6321dee91b Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sun, 2 Oct 2022 22:28:56 -0500
Subject: [PATCH] Shader program cleanup

---
 scwx-qt/source/scwx/qt/gl/shader_program.cpp | 22 +++++++++-----------
 scwx-qt/source/scwx/qt/gl/shader_program.hpp |  8 +++----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/gl/shader_program.cpp b/scwx-qt/source/scwx/qt/gl/shader_program.cpp
index bbf0a73b..1d9e2143 100644
--- a/scwx-qt/source/scwx/qt/gl/shader_program.cpp
+++ b/scwx-qt/source/scwx/qt/gl/shader_program.cpp
@@ -13,19 +13,18 @@ namespace gl
 static const std::string logPrefix_ = "scwx::qt::gl::shader_program";
 static const auto        logger_    = scwx::util::Logger::Create(logPrefix_);
 
-static constexpr GLsizei INFO_LOG_BUF_SIZE = 512;
+static constexpr GLsizei kInfoLogBufSize = 512;
 
-class ShaderProgramImpl
+class ShaderProgram::Impl
 {
 public:
-   explicit ShaderProgramImpl(OpenGLFunctions& gl) :
-       gl_(gl), id_ {GL_INVALID_INDEX}
+   explicit Impl(OpenGLFunctions& gl) : gl_(gl), id_ {GL_INVALID_INDEX}
    {
       // Create shader program
       id_ = gl_.glCreateProgram();
    }
 
-   ~ShaderProgramImpl()
+   ~Impl()
    {
       // Delete shader program
       gl_.glDeleteProgram(id_);
@@ -37,12 +36,12 @@ public:
 };
 
 ShaderProgram::ShaderProgram(OpenGLFunctions& gl) :
-    p(std::make_unique<ShaderProgramImpl>(gl))
+    p(std::make_unique<Impl>(gl))
 {
 }
 ShaderProgram::~ShaderProgram() = default;
 
-ShaderProgram::ShaderProgram(ShaderProgram&&) noexcept = default;
+ShaderProgram::ShaderProgram(ShaderProgram&&) noexcept            = default;
 ShaderProgram& ShaderProgram::operator=(ShaderProgram&&) noexcept = default;
 
 GLuint ShaderProgram::id() const
@@ -59,7 +58,7 @@ bool ShaderProgram::Load(const std::string& vertexPath,
 
    GLint   glSuccess;
    bool    success = true;
-   char    infoLog[INFO_LOG_BUF_SIZE];
+   char    infoLog[kInfoLogBufSize];
    GLsizei logLength;
 
    QFile vertexFile(vertexPath.c_str());
@@ -102,7 +101,7 @@ bool ShaderProgram::Load(const std::string& vertexPath,
 
    // Check for errors
    gl.glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &glSuccess);
-   gl.glGetShaderInfoLog(vertexShader, INFO_LOG_BUF_SIZE, &logLength, infoLog);
+   gl.glGetShaderInfoLog(vertexShader, kInfoLogBufSize, &logLength, infoLog);
    if (!glSuccess)
    {
       logger_->error("Vertex shader compilation failed: {}", infoLog);
@@ -122,8 +121,7 @@ bool ShaderProgram::Load(const std::string& vertexPath,
 
    // Check for errors
    gl.glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &glSuccess);
-   gl.glGetShaderInfoLog(
-      fragmentShader, INFO_LOG_BUF_SIZE, &logLength, infoLog);
+   gl.glGetShaderInfoLog(fragmentShader, kInfoLogBufSize, &logLength, infoLog);
    if (!glSuccess)
    {
       logger_->error("Fragment shader compilation failed: {}", infoLog);
@@ -142,7 +140,7 @@ bool ShaderProgram::Load(const std::string& vertexPath,
 
       // Check for errors
       gl.glGetProgramiv(p->id_, GL_LINK_STATUS, &glSuccess);
-      gl.glGetProgramInfoLog(p->id_, INFO_LOG_BUF_SIZE, &logLength, infoLog);
+      gl.glGetProgramInfoLog(p->id_, kInfoLogBufSize, &logLength, infoLog);
       if (!glSuccess)
       {
          logger_->error("Shader program link failed: {}", infoLog);
diff --git a/scwx-qt/source/scwx/qt/gl/shader_program.hpp b/scwx-qt/source/scwx/qt/gl/shader_program.hpp
index 386cb627..9f84053e 100644
--- a/scwx-qt/source/scwx/qt/gl/shader_program.hpp
+++ b/scwx-qt/source/scwx/qt/gl/shader_program.hpp
@@ -16,15 +16,13 @@ namespace qt
 namespace gl
 {
 
-class ShaderProgramImpl;
-
 class ShaderProgram
 {
 public:
    explicit ShaderProgram(OpenGLFunctions& gl);
    virtual ~ShaderProgram();
 
-   ShaderProgram(const ShaderProgram&) = delete;
+   ShaderProgram(const ShaderProgram&)            = delete;
    ShaderProgram& operator=(const ShaderProgram&) = delete;
 
    ShaderProgram(ShaderProgram&&) noexcept;
@@ -37,7 +35,9 @@ public:
    void Use() const;
 
 private:
-   std::unique_ptr<ShaderProgramImpl> p;
+   class Impl;
+
+   std::unique_ptr<Impl> p;
 };
 
 } // namespace gl