Renamed Texture*_OGL to Texture*_GL

17 files changed, 346 insertions, 346 deletions

diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
index f9c10846..fb0e438b 100644
--- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
+++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -30,14 +30,14 @@ set(INCLUDE
     include/ShaderResourceBindingGLImpl.hpp
     include/SwapChainGLBase.hpp
     include/TexRegionRender.hpp
-    include/Texture1D_OGL.hpp
-    include/Texture1DArray_OGL.hpp
-    include/Texture2D_OGL.hpp
-    include/Texture2DArray_OGL.hpp
-    include/Texture3D_OGL.hpp
+    include/Texture1D_GL.hpp
+    include/Texture1DArray_GL.hpp
+    include/Texture2D_GL.hpp
+    include/Texture2DArray_GL.hpp
+    include/Texture3D_GL.hpp
     include/TextureBaseGL.hpp
-    include/TextureCube_OGL.hpp
-    include/TextureCubeArray_OGL.hpp
+    include/TextureCube_GL.hpp
+    include/TextureCubeArray_GL.hpp
     include/TextureViewGLImpl.hpp
     include/VAOCache.hpp
 )
@@ -83,14 +83,14 @@ set(SOURCE
     src/ShaderGLImpl.cpp
     src/ShaderResourceBindingGLImpl.cpp
     src/TexRegionRender.cpp
-    src/Texture1D_OGL.cpp
-    src/Texture1DArray_OGL.cpp
-    src/Texture2D_OGL.cpp
-    src/Texture2DArray_OGL.cpp
-    src/Texture3D_OGL.cpp
+    src/Texture1D_GL.cpp
+    src/Texture1DArray_GL.cpp
+    src/Texture2D_GL.cpp
+    src/Texture2DArray_GL.cpp
+    src/Texture3D_GL.cpp
     src/TextureBaseGL.cpp
-    src/TextureCube_OGL.cpp
-    src/TextureCubeArray_OGL.cpp
+    src/TextureCube_GL.cpp
+    src/TextureCubeArray_GL.cpp
     src/TextureViewGLImpl.cpp
     src/VAOCache.cpp
 )
@@ -219,7 +219,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             src/DeviceContextGLImpl.cpp
             src/GLContextState.cpp
             src/RenderDeviceGLImpl.cpp
-            src/Texture1D_OGL.cpp
+            src/Texture1D_GL.cpp
         PROPERTIES
             COMPILE_FLAGS -Wno-unused-variable
         )
diff --git a/Graphics/GraphicsEngineOpenGL/include/Texture1DArray_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/Texture1DArray_GL.hpp
index a1dd412f..fd0a31b5 100644
--- a/Graphics/GraphicsEngineOpenGL/include/Texture1DArray_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/Texture1DArray_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// 1D texture array implementation in OpenGL backend.
-class Texture1DArray_OGL final : public TextureBaseGL
+class Texture1DArray_GL final : public TextureBaseGL
 {
 public:
-    Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
-                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                       class RenderDeviceGLImpl*  pDeviceGL,
-                       class GLContextState&      GLState,
-                       const TextureDesc&         TexDesc,
-                       const TextureData*         pInitData         = nullptr,
-                       bool                       bIsDeviceInternal = false);
+    Texture1DArray_GL(IReferenceCounters*        pRefCounters,
+                      FixedBlockMemoryAllocator& TexViewObjAllocator,
+                      class RenderDeviceGLImpl*  pDeviceGL,
+                      class GLContextState&      GLState,
+                      const TextureDesc&         TexDesc,
+                      const TextureData*         pInitData         = nullptr,
+                      bool                       bIsDeviceInternal = false);
 
-    Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
-                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                       class RenderDeviceGLImpl*  pDeviceGL,
-                       class GLContextState&      GLState,
-                       const TextureDesc&         TexDesc,
-                       GLuint                     GLTextureHandle,
-                       GLuint                     GLBindTarget,
-                       bool                       bIsDeviceInternal = false);
-    ~Texture1DArray_OGL();
+    Texture1DArray_GL(IReferenceCounters*        pRefCounters,
+                      FixedBlockMemoryAllocator& TexViewObjAllocator,
+                      class RenderDeviceGLImpl*  pDeviceGL,
+                      class GLContextState&      GLState,
+                      const TextureDesc&         TexDesc,
+                      GLuint                     GLTextureHandle,
+                      GLuint                     GLBindTarget,
+                      bool                       bIsDeviceInternal = false);
+    ~Texture1DArray_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for 1D texture array.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/Texture1D_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/Texture1D_GL.hpp
index 6030561c..472acc34 100644
--- a/Graphics/GraphicsEngineOpenGL/include/Texture1D_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/Texture1D_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// 1D texture implementation in OpenGL backend.
-class Texture1D_OGL final : public TextureBaseGL
+class Texture1D_GL final : public TextureBaseGL
 {
 public:
-    Texture1D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  const TextureData*         pInitData         = nullptr,
-                  bool                       bIsDeviceInternal = false);
+    Texture1D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 const TextureData*         pInitData         = nullptr,
+                 bool                       bIsDeviceInternal = false);
 
-    Texture1D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  GLuint                     GLTextureHandle,
-                  GLuint                     GLBindTarget,
-                  bool                       bIsDeviceInternal = false);
-    ~Texture1D_OGL();
+    Texture1D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 GLuint                     GLTextureHandle,
+                 GLuint                     GLBindTarget,
+                 bool                       bIsDeviceInternal = false);
+    ~Texture1D_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for 1D texture.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/Texture2DArray_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/Texture2DArray_GL.hpp
index c5bc0624..ee75115b 100644
--- a/Graphics/GraphicsEngineOpenGL/include/Texture2DArray_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/Texture2DArray_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// 2D texture array implementation in OpenGL backend.
-class Texture2DArray_OGL final : public TextureBaseGL
+class Texture2DArray_GL final : public TextureBaseGL
 {
 public:
-    Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
-                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                       class RenderDeviceGLImpl*  pDeviceGL,
-                       class GLContextState&      GLState,
-                       const TextureDesc&         TexDesc,
-                       const TextureData*         pInitData         = nullptr,
-                       bool                       bIsDeviceInternal = false);
+    Texture2DArray_GL(IReferenceCounters*        pRefCounters,
+                      FixedBlockMemoryAllocator& TexViewObjAllocator,
+                      class RenderDeviceGLImpl*  pDeviceGL,
+                      class GLContextState&      GLState,
+                      const TextureDesc&         TexDesc,
+                      const TextureData*         pInitData         = nullptr,
+                      bool                       bIsDeviceInternal = false);
 
-    Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
-                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                       class RenderDeviceGLImpl*  pDeviceGL,
-                       class GLContextState&      GLState,
-                       const TextureDesc&         TexDesc,
-                       GLuint                     GLTextureHandle,
-                       GLuint                     GLBindTarget,
-                       bool                       bIsDeviceInternal = false);
-    ~Texture2DArray_OGL();
+    Texture2DArray_GL(IReferenceCounters*        pRefCounters,
+                      FixedBlockMemoryAllocator& TexViewObjAllocator,
+                      class RenderDeviceGLImpl*  pDeviceGL,
+                      class GLContextState&      GLState,
+                      const TextureDesc&         TexDesc,
+                      GLuint                     GLTextureHandle,
+                      GLuint                     GLBindTarget,
+                      bool                       bIsDeviceInternal = false);
+    ~Texture2DArray_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for 2D texture array.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/Texture2D_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/Texture2D_GL.hpp
index cc5a2edb..a2ced4ba 100644
--- a/Graphics/GraphicsEngineOpenGL/include/Texture2D_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/Texture2D_GL.hpp
@@ -33,34 +33,34 @@ namespace Diligent
 {
 
 /// 2D texture implementation in OpenGL backend.
-class Texture2D_OGL final : public TextureBaseGL
+class Texture2D_GL final : public TextureBaseGL
 {
 public:
-    Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  const TextureData*         pInitData         = nullptr,
-                  bool                       bIsDeviceInternal = false);
+    Texture2D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 const TextureData*         pInitData         = nullptr,
+                 bool                       bIsDeviceInternal = false);
 
-    Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  GLuint                     GLTextureHandle,
-                  GLuint                     GLBindTarget,
-                  bool                       bIsDeviceInternal = false);
+    Texture2D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 GLuint                     GLTextureHandle,
+                 GLuint                     GLBindTarget,
+                 bool                       bIsDeviceInternal = false);
 
     /// This constructor is used to create a dummy texture object for the default framebuffer.
-    Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  const TextureDesc&         TexDesc,
-                  bool                       bIsDeviceInternal = false);
+    Texture2D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 const TextureDesc&         TexDesc,
+                 bool                       bIsDeviceInternal = false);
 
-    ~Texture2D_OGL();
+    ~Texture2D_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for 2D texture.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/Texture3D_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/Texture3D_GL.hpp
index 49581a93..f531c1e9 100644
--- a/Graphics/GraphicsEngineOpenGL/include/Texture3D_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/Texture3D_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// 3D texture implementation in OpenGL backend.
-class Texture3D_OGL final : public TextureBaseGL
+class Texture3D_GL final : public TextureBaseGL
 {
 public:
-    Texture3D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  const TextureData*         pInitData         = nullptr,
-                  bool                       bIsDeviceInternal = false);
+    Texture3D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 const TextureData*         pInitData         = nullptr,
+                 bool                       bIsDeviceInternal = false);
 
-    Texture3D_OGL(IReferenceCounters*        pRefCounters,
-                  FixedBlockMemoryAllocator& TexViewObjAllocator,
-                  class RenderDeviceGLImpl*  pDeviceGL,
-                  class GLContextState&      GLState,
-                  const TextureDesc&         TexDesc,
-                  GLuint                     GLTextureHandle,
-                  GLuint                     GLBindTarget,
-                  bool                       bIsDeviceInternal = false);
-    ~Texture3D_OGL();
+    Texture3D_GL(IReferenceCounters*        pRefCounters,
+                 FixedBlockMemoryAllocator& TexViewObjAllocator,
+                 class RenderDeviceGLImpl*  pDeviceGL,
+                 class GLContextState&      GLState,
+                 const TextureDesc&         TexDesc,
+                 GLuint                     GLTextureHandle,
+                 GLuint                     GLBindTarget,
+                 bool                       bIsDeviceInternal = false);
+    ~Texture3D_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for 3D texture.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureCubeArray_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureCubeArray_GL.hpp
index 6fb6838e..03c95e09 100644
--- a/Graphics/GraphicsEngineOpenGL/include/TextureCubeArray_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/TextureCubeArray_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// Cube array texture implementation in OpenGL backend.
-class TextureCubeArray_OGL final : public TextureBaseGL
+class TextureCubeArray_GL final : public TextureBaseGL
 {
 public:
-    TextureCubeArray_OGL(IReferenceCounters*        pRefCounters,
-                         FixedBlockMemoryAllocator& TexViewObjAllocator,
-                         class RenderDeviceGLImpl*  pDeviceGL,
-                         class GLContextState&      GLState,
-                         const TextureDesc&         TexDesc,
-                         const TextureData*         pInitData         = nullptr,
-                         bool                       bIsDeviceInternal = false);
+    TextureCubeArray_GL(IReferenceCounters*        pRefCounters,
+                        FixedBlockMemoryAllocator& TexViewObjAllocator,
+                        class RenderDeviceGLImpl*  pDeviceGL,
+                        class GLContextState&      GLState,
+                        const TextureDesc&         TexDesc,
+                        const TextureData*         pInitData         = nullptr,
+                        bool                       bIsDeviceInternal = false);
 
-    TextureCubeArray_OGL(IReferenceCounters*        pRefCounters,
-                         FixedBlockMemoryAllocator& TexViewObjAllocator,
-                         class RenderDeviceGLImpl*  pDeviceGL,
-                         class GLContextState&      GLState,
-                         const TextureDesc&         TexDesc,
-                         GLuint                     GLTextureHandle,
-                         GLuint                     GLBindTarget,
-                         bool                       bIsDeviceInternal = false);
-    ~TextureCubeArray_OGL();
+    TextureCubeArray_GL(IReferenceCounters*        pRefCounters,
+                        FixedBlockMemoryAllocator& TexViewObjAllocator,
+                        class RenderDeviceGLImpl*  pDeviceGL,
+                        class GLContextState&      GLState,
+                        const TextureDesc&         TexDesc,
+                        GLuint                     GLTextureHandle,
+                        GLuint                     GLBindTarget,
+                        bool                       bIsDeviceInternal = false);
+    ~TextureCubeArray_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for cube texture array.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureCube_OGL.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureCube_GL.hpp
index 3e719878..f35d4066 100644
--- a/Graphics/GraphicsEngineOpenGL/include/TextureCube_OGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/TextureCube_GL.hpp
@@ -33,26 +33,26 @@ namespace Diligent
 {
 
 /// Cube texture implementation in OpenGL backend.
-class TextureCube_OGL final : public TextureBaseGL
+class TextureCube_GL final : public TextureBaseGL
 {
 public:
-    TextureCube_OGL(IReferenceCounters*        pRefCounters,
-                    FixedBlockMemoryAllocator& TexViewObjAllocator,
-                    class RenderDeviceGLImpl*  pDeviceGL,
-                    class GLContextState&      GLState,
-                    const TextureDesc&         TexDesc,
-                    const TextureData*         pInitData         = nullptr,
-                    bool                       bIsDeviceInternal = false);
+    TextureCube_GL(IReferenceCounters*        pRefCounters,
+                   FixedBlockMemoryAllocator& TexViewObjAllocator,
+                   class RenderDeviceGLImpl*  pDeviceGL,
+                   class GLContextState&      GLState,
+                   const TextureDesc&         TexDesc,
+                   const TextureData*         pInitData         = nullptr,
+                   bool                       bIsDeviceInternal = false);
 
-    TextureCube_OGL(IReferenceCounters*        pRefCounters,
-                    FixedBlockMemoryAllocator& TexViewObjAllocator,
-                    class RenderDeviceGLImpl*  pDeviceGL,
-                    class GLContextState&      GLState,
-                    const TextureDesc&         TexDesc,
-                    GLuint                     GLTextureHandle,
-                    GLuint                     GLBindTarget,
-                    bool                       bIsDeviceInternal = false);
-    ~TextureCube_OGL();
+    TextureCube_GL(IReferenceCounters*        pRefCounters,
+                   FixedBlockMemoryAllocator& TexViewObjAllocator,
+                   class RenderDeviceGLImpl*  pDeviceGL,
+                   class GLContextState&      GLState,
+                   const TextureDesc&         TexDesc,
+                   GLuint                     GLTextureHandle,
+                   GLuint                     GLBindTarget,
+                   bool                       bIsDeviceInternal = false);
+    ~TextureCube_GL();
 
     /// Implementation of TextureBaseGL::UpdateData() for cube texture.
     virtual void UpdateData(class GLContextState&    CtxState,
diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
index e2c9bb0e..98f908b0 100644
--- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
@@ -39,11 +39,11 @@
 #include "RenderDeviceGLImpl.hpp"
 #include "BufferGLImpl.hpp"
 #include "ShaderGLImpl.hpp"
-#include "Texture1D_OGL.hpp"
-#include "Texture1DArray_OGL.hpp"
-#include "Texture2D_OGL.hpp"
-#include "Texture2DArray_OGL.hpp"
-#include "Texture3D_OGL.hpp"
+#include "Texture1D_GL.hpp"
+#include "Texture1DArray_GL.hpp"
+#include "Texture2D_GL.hpp"
+#include "Texture2DArray_GL.hpp"
+#include "Texture3D_GL.hpp"
 #include "SamplerGLImpl.hpp"
 #include "BufferViewGLImpl.hpp"
 #include "PipelineStateGLImpl.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
index 8cfdba7d..8cf07274 100644
--- a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
@@ -31,13 +31,13 @@
 
 #include "BufferGLImpl.hpp"
 #include "ShaderGLImpl.hpp"
-#include "Texture1D_OGL.hpp"
-#include "Texture1DArray_OGL.hpp"
-#include "Texture2D_OGL.hpp"
-#include "Texture2DArray_OGL.hpp"
-#include "Texture3D_OGL.hpp"
-#include "TextureCube_OGL.hpp"
-#include "TextureCubeArray_OGL.hpp"
+#include "Texture1D_GL.hpp"
+#include "Texture1DArray_GL.hpp"
+#include "Texture2D_GL.hpp"
+#include "Texture2DArray_GL.hpp"
+#include "Texture3D_GL.hpp"
+#include "TextureCube_GL.hpp"
+#include "TextureCubeArray_GL.hpp"
 #include "SamplerGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "PipelineStateGLImpl.hpp"
@@ -547,31 +547,31 @@ void RenderDeviceGLImpl::CreateTexture(const TextureDesc& TexDesc, const Texture
             switch (TexDesc.Type)
             {
                 case RESOURCE_DIM_TEX_1D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1D_OGL instance", Texture1D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1D_GL instance", Texture1D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_1D_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1DArray_OGL instance", Texture1DArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1DArray_GL instance", Texture1DArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_2D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2D_OGL instance", Texture2D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2D_GL instance", Texture2D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_2D_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2DArray_OGL instance", Texture2DArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2DArray_GL instance", Texture2DArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_3D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture3D_OGL instance", Texture3D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture3D_GL instance", Texture3D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_CUBE:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCube_OGL instance", TextureCube_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCube_GL instance", TextureCube_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 case RESOURCE_DIM_TEX_CUBE_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCubeArray_OGL instance", TextureCubeArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCubeArray_GL instance", TextureCubeArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, pData, bIsDeviceInternal);
                     break;
 
                 default: LOG_ERROR_AND_THROW("Unknown texture type. (Did you forget to initialize the Type member of TextureDesc structure?)");
@@ -607,31 +607,31 @@ void RenderDeviceGLImpl::CreateTextureFromGLHandle(Uint32             GLHandle,
             switch (TexDesc.Type)
             {
                 case RESOURCE_DIM_TEX_1D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1D_OGL instance", Texture1D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1D_GL instance", Texture1D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_1D_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1DArray_OGL instance", Texture1DArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture1DArray_GL instance", Texture1DArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_2D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2D_OGL instance", Texture2D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2D_GL instance", Texture2D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_2D_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2DArray_OGL instance", Texture2DArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture2DArray_GL instance", Texture2DArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_3D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture3D_OGL instance", Texture3D_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Texture3D_GL instance", Texture3D_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_CUBE:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCube_OGL instance", TextureCube_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCube_GL instance", TextureCube_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 case RESOURCE_DIM_TEX_CUBE_ARRAY:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCubeArray_OGL instance", TextureCubeArray_OGL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "TextureCubeArray_GL instance", TextureCubeArray_GL)(m_TexViewObjAllocator, this, GLState, TexDesc, GLHandle, GLBindTarget);
                     break;
 
                 default: LOG_ERROR_AND_THROW("Unknown texture type. (Did you forget to initialize the Type member of TextureDesc structure?)");
@@ -653,7 +653,7 @@ void RenderDeviceGLImpl::CreateDummyTexture(const TextureDesc& TexDesc, RESOURCE
             switch (TexDesc.Type)
             {
                 case RESOURCE_DIM_TEX_2D:
-                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Dummy Texture2D_OGL instance", Texture2D_OGL)(m_TexViewObjAllocator, this, TexDesc);
+                    pTextureOGL = NEW_RC_OBJ(m_TexObjAllocator, "Dummy Texture2D_GL instance", Texture2D_GL)(m_TexViewObjAllocator, this, TexDesc);
                     break;
 
                 default: LOG_ERROR_AND_THROW("Unsupported texture type.");
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_GL.cpp
index 8d49522b..dcf32604 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "Texture1DArray_OGL.hpp"
+#include "Texture1DArray_GL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "BufferGLImpl.hpp"
@@ -36,13 +36,13 @@
 namespace Diligent
 {
 
-Texture1DArray_OGL::Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
-                                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                       RenderDeviceGLImpl*        pDeviceGL,
-                                       GLContextState&            GLState,
-                                       const TextureDesc&         TexDesc,
-                                       const TextureData*         pInitData /*= nullptr*/,
-                                       bool                       bIsDeviceInternal /*= false*/) :
+Texture1DArray_GL::Texture1DArray_GL(IReferenceCounters*        pRefCounters,
+                                     FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                     RenderDeviceGLImpl*        pDeviceGL,
+                                     GLContextState&            GLState,
+                                     const TextureDesc&         TexDesc,
+                                     const TextureData*         pInitData /*= nullptr*/,
+                                     bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -87,10 +87,10 @@ Texture1DArray_OGL::Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
                     Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                                0, 1};
                     // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                    // we will get into TextureBaseGL::UpdateData(), because instance of Texture1DArray_OGL
+                    // we will get into TextureBaseGL::UpdateData(), because instance of Texture1DArray_GL
                     // is not fully constructed yet.
                     // To call the required function, we need to explicitly specify the class:
-                    Texture1DArray_OGL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
+                    Texture1DArray_GL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
                 }
             }
         }
@@ -103,14 +103,14 @@ Texture1DArray_OGL::Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-Texture1DArray_OGL::Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
-                                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                       RenderDeviceGLImpl*        pDeviceGL,
-                                       GLContextState&            GLState,
-                                       const TextureDesc&         TexDesc,
-                                       GLuint                     GLTextureHandle,
-                                       GLuint                     GLBindTarget,
-                                       bool                       bIsDeviceInternal) :
+Texture1DArray_GL::Texture1DArray_GL(IReferenceCounters*        pRefCounters,
+                                     FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                     RenderDeviceGLImpl*        pDeviceGL,
+                                     GLContextState&            GLState,
+                                     const TextureDesc&         TexDesc,
+                                     GLuint                     GLTextureHandle,
+                                     GLuint                     GLBindTarget,
+                                     bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -127,15 +127,15 @@ Texture1DArray_OGL::Texture1DArray_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-Texture1DArray_OGL::~Texture1DArray_OGL()
+Texture1DArray_GL::~Texture1DArray_GL()
 {
 }
 
-void Texture1DArray_OGL::UpdateData(GLContextState&          ContextState,
-                                    Uint32                   MipLevel,
-                                    Uint32                   Slice,
-                                    const Box&               DstBox,
-                                    const TextureSubResData& SubresData)
+void Texture1DArray_GL::UpdateData(GLContextState&          ContextState,
+                                   Uint32                   MipLevel,
+                                   Uint32                   Slice,
+                                   const Box&               DstBox,
+                                   const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -180,7 +180,7 @@ void Texture1DArray_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void Texture1DArray_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void Texture1DArray_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     if (ViewDesc.NumArraySlices == m_Desc.ArraySize)
     {
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture1D_GL.cpp
index 9ddd61bc..1fdd5135 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture1D_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "Texture1D_OGL.hpp"
+#include "Texture1D_GL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "BufferGLImpl.hpp"
@@ -36,13 +36,13 @@
 namespace Diligent
 {
 
-Texture1D_OGL::Texture1D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             const TextureData*         pInitData /*= nullptr*/,
-                             bool                       bIsDeviceInternal /*= false*/) :
+Texture1D_GL::Texture1D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           const TextureData*         pInitData /*= nullptr*/,
+                           bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -85,10 +85,10 @@ Texture1D_OGL::Texture1D_OGL(IReferenceCounters*        pRefCounters,
                 Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                            0, 1};
                 // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                // we will get into TextureBaseGL::UpdateData(), because instance of Texture1D_OGL
+                // we will get into TextureBaseGL::UpdateData(), because instance of Texture1D_GL
                 // is not fully constructed yet.
                 // To call the required function, we need to explicitly specify the class:
-                Texture1D_OGL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
+                Texture1D_GL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
             }
         }
         else
@@ -100,14 +100,14 @@ Texture1D_OGL::Texture1D_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-Texture1D_OGL::Texture1D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             GLuint                     GLTextureHandle,
-                             GLuint                     GLBindTarget,
-                             bool                       bIsDeviceInternal) :
+Texture1D_GL::Texture1D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           GLuint                     GLTextureHandle,
+                           GLuint                     GLBindTarget,
+                           bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -124,15 +124,15 @@ Texture1D_OGL::Texture1D_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-Texture1D_OGL::~Texture1D_OGL()
+Texture1D_GL::~Texture1D_GL()
 {
 }
 
-void Texture1D_OGL::UpdateData(GLContextState&          ContextState,
-                               Uint32                   MipLevel,
-                               Uint32                   Slice,
-                               const Box&               DstBox,
-                               const TextureSubResData& SubresData)
+void Texture1D_GL::UpdateData(GLContextState&          ContextState,
+                              Uint32                   MipLevel,
+                              Uint32                   Slice,
+                              const Box&               DstBox,
+                              const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -174,7 +174,7 @@ void Texture1D_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void Texture1D_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void Texture1D_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     // For glFramebufferTexture1D(), if texture name is not zero, then texture target must be GL_TEXTURE_1D
     glFramebufferTexture1D(GL_DRAW_FRAMEBUFFER, AttachmentPoint, m_BindTarget, m_GlTexture, ViewDesc.MostDetailedMip);
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_GL.cpp
index a544c080..893c7e51 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "Texture2DArray_OGL.hpp"
+#include "Texture2DArray_GL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "BufferGLImpl.hpp"
@@ -37,13 +37,13 @@
 namespace Diligent
 {
 
-Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
-                                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                       RenderDeviceGLImpl*        pDeviceGL,
-                                       GLContextState&            GLState,
-                                       const TextureDesc&         TexDesc,
-                                       const TextureData*         pInitData /*= nullptr*/,
-                                       bool                       bIsDeviceInternal /*= false*/) :
+Texture2DArray_GL::Texture2DArray_GL(IReferenceCounters*        pRefCounters,
+                                     FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                     RenderDeviceGLImpl*        pDeviceGL,
+                                     GLContextState&            GLState,
+                                     const TextureDesc&         TexDesc,
+                                     const TextureData*         pInitData /*= nullptr*/,
+                                     bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -107,10 +107,10 @@ Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
                         Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                                    0, std::max(m_Desc.Height >> Mip, 1U)};
                         // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                        // we will get into TextureBaseGL::UpdateData(), because instance of Texture2DArray_OGL
+                        // we will get into TextureBaseGL::UpdateData(), because instance of Texture2DArray_GL
                         // is not fully constructed yet.
                         // To call the required function, we need to explicitly specify the class:
-                        Texture2DArray_OGL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
+                        Texture2DArray_GL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
                     }
                 }
             }
@@ -124,14 +124,14 @@ Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
-                                       FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                       RenderDeviceGLImpl*        pDeviceGL,
-                                       GLContextState&            GLState,
-                                       const TextureDesc&         TexDesc,
-                                       GLuint                     GLTextureHandle,
-                                       GLuint                     GLBindTarget,
-                                       bool                       bIsDeviceInternal) :
+Texture2DArray_GL::Texture2DArray_GL(IReferenceCounters*        pRefCounters,
+                                     FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                     RenderDeviceGLImpl*        pDeviceGL,
+                                     GLContextState&            GLState,
+                                     const TextureDesc&         TexDesc,
+                                     GLuint                     GLTextureHandle,
+                                     GLuint                     GLBindTarget,
+                                     bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -150,15 +150,15 @@ Texture2DArray_OGL::Texture2DArray_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-Texture2DArray_OGL::~Texture2DArray_OGL()
+Texture2DArray_GL::~Texture2DArray_GL()
 {
 }
 
-void Texture2DArray_OGL::UpdateData(GLContextState&          ContextState,
-                                    Uint32                   MipLevel,
-                                    Uint32                   Slice,
-                                    const Box&               DstBox,
-                                    const TextureSubResData& SubresData)
+void Texture2DArray_GL::UpdateData(GLContextState&          ContextState,
+                                   Uint32                   MipLevel,
+                                   Uint32                   Slice,
+                                   const Box&               DstBox,
+                                   const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -254,7 +254,7 @@ void Texture2DArray_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void Texture2DArray_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void Texture2DArray_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     if (ViewDesc.NumArraySlices == m_Desc.ArraySize)
     {
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2D_GL.cpp
index 7442bf5b..e62876be 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture2D_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "Texture2D_OGL.hpp"
+#include "Texture2D_GL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "BufferGLImpl.hpp"
@@ -37,13 +37,13 @@
 namespace Diligent
 {
 
-Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             const TextureData*         pInitData /*= nullptr*/,
-                             bool                       bIsDeviceInternal /*= false*/) :
+Texture2D_GL::Texture2D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           const TextureData*         pInitData /*= nullptr*/,
+                           bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -111,10 +111,10 @@ Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
                     Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                                0, std::max(m_Desc.Height >> Mip, 1U)};
                     // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                    // we will get into TextureBaseGL::UpdateData(), because instance of Texture2D_OGL
+                    // we will get into TextureBaseGL::UpdateData(), because instance of Texture2D_GL
                     // is not fully constructed yet.
                     // To call the required function, we need to explicitly specify the class:
-                    Texture2D_OGL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
+                    Texture2D_GL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
                 }
             }
             else
@@ -127,14 +127,14 @@ Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             GLuint                     GLTextureHandle,
-                             GLuint                     GLBindTarget,
-                             bool                       bIsDeviceInternal) :
+Texture2D_GL::Texture2D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           GLuint                     GLTextureHandle,
+                           GLuint                     GLBindTarget,
+                           bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -153,11 +153,11 @@ Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             const TextureDesc&         TexDesc,
-                             bool                       bIsDeviceInternal) :
+Texture2D_GL::Texture2D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           const TextureDesc&         TexDesc,
+                           bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -172,15 +172,15 @@ Texture2D_OGL::Texture2D_OGL(IReferenceCounters*        pRefCounters,
 }
 
 
-Texture2D_OGL::~Texture2D_OGL()
+Texture2D_GL::~Texture2D_GL()
 {
 }
 
-void Texture2D_OGL::UpdateData(GLContextState&          ContextState,
-                               Uint32                   MipLevel,
-                               Uint32                   Slice,
-                               const Box&               DstBox,
-                               const TextureSubResData& SubresData)
+void Texture2D_GL::UpdateData(GLContextState&          ContextState,
+                              Uint32                   MipLevel,
+                              Uint32                   Slice,
+                              const Box&               DstBox,
+                              const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -273,7 +273,7 @@ void Texture2D_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void Texture2D_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void Texture2D_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     // For glFramebufferTexture2D(), if texture name is not zero, then texture target must be GL_TEXTURE_2D,
     // GL_TEXTURE_RECTANGLE or one of the 6 cubemap face targets GL_TEXTURE_CUBE_MAP_POSITIVE_X, ...
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture3D_GL.cpp
index 52717652..e62932c0 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture3D_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "Texture3D_OGL.hpp"
+#include "Texture3D_GL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "BufferGLImpl.hpp"
@@ -37,13 +37,13 @@
 namespace Diligent
 {
 
-Texture3D_OGL::Texture3D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             const TextureData*         pInitData /*= TextureData()*/,
-                             bool                       bIsDeviceInternal /*= false*/) :
+Texture3D_GL::Texture3D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           const TextureData*         pInitData /*= TextureData()*/,
+                           bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -89,10 +89,10 @@ Texture3D_OGL::Texture3D_OGL(IReferenceCounters*        pRefCounters,
                            0, std::max(m_Desc.Height >> Mip, 1U),
                            0, std::max(m_Desc.Depth >> Mip, 1U)};
                 // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                // we will get into TextureBaseGL::UpdateData(), because instance of Texture3D_OGL
+                // we will get into TextureBaseGL::UpdateData(), because instance of Texture3D_GL
                 // is not fully constructed yet.
                 // To call the required function, we need to explicitly specify the class:
-                Texture3D_OGL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
+                Texture3D_GL::UpdateData(GLState, Mip, 0, DstBox, pInitData->pSubResources[Mip]);
             }
         }
         else
@@ -104,14 +104,14 @@ Texture3D_OGL::Texture3D_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-Texture3D_OGL::Texture3D_OGL(IReferenceCounters*        pRefCounters,
-                             FixedBlockMemoryAllocator& TexViewObjAllocator,
-                             RenderDeviceGLImpl*        pDeviceGL,
-                             GLContextState&            GLState,
-                             const TextureDesc&         TexDesc,
-                             GLuint                     GLTextureHandle,
-                             GLuint                     GLBindTarget,
-                             bool                       bIsDeviceInternal) :
+Texture3D_GL::Texture3D_GL(IReferenceCounters*        pRefCounters,
+                           FixedBlockMemoryAllocator& TexViewObjAllocator,
+                           RenderDeviceGLImpl*        pDeviceGL,
+                           GLContextState&            GLState,
+                           const TextureDesc&         TexDesc,
+                           GLuint                     GLTextureHandle,
+                           GLuint                     GLBindTarget,
+                           bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -128,16 +128,16 @@ Texture3D_OGL::Texture3D_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-Texture3D_OGL::~Texture3D_OGL()
+Texture3D_GL::~Texture3D_GL()
 {
 }
 
 
-void Texture3D_OGL::UpdateData(GLContextState&          ContextState,
-                               Uint32                   MipLevel,
-                               Uint32                   Slice,
-                               const Box&               DstBox,
-                               const TextureSubResData& SubresData)
+void Texture3D_GL::UpdateData(GLContextState&          ContextState,
+                              Uint32                   MipLevel,
+                              Uint32                   Slice,
+                              const Box&               DstBox,
+                              const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -192,7 +192,7 @@ void Texture3D_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void Texture3D_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void Texture3D_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     auto NumDepthSlicesInMip = m_Desc.Depth >> ViewDesc.MostDetailedMip;
     if (ViewDesc.NumDepthSlices == NumDepthSlicesInMip)
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_GL.cpp
index 443cb792..840d1ab5 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "TextureCubeArray_OGL.hpp"
+#include "TextureCubeArray_GL.hpp"
 
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
@@ -40,13 +40,13 @@
 namespace Diligent
 {
 
-TextureCubeArray_OGL::TextureCubeArray_OGL(IReferenceCounters*        pRefCounters,
-                                           FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                           RenderDeviceGLImpl*        pDeviceGL,
-                                           GLContextState&            GLState,
-                                           const TextureDesc&         TexDesc,
-                                           const TextureData*         pInitData /*= nullptr*/,
-                                           bool                       bIsDeviceInternal /*= false*/) :
+TextureCubeArray_GL::TextureCubeArray_GL(IReferenceCounters*        pRefCounters,
+                                         FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                         RenderDeviceGLImpl*        pDeviceGL,
+                                         GLContextState&            GLState,
+                                         const TextureDesc&         TexDesc,
+                                         const TextureData*         pInitData /*= nullptr*/,
+                                         bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -99,10 +99,10 @@ TextureCubeArray_OGL::TextureCubeArray_OGL(IReferenceCounters*        pRefCounte
                     Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                                0, std::max(m_Desc.Height >> Mip, 1U)};
                     // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                    // we will get into TextureBaseGL::UpdateData(), because instance of TextureCubeArray_OGL
+                    // we will get into TextureBaseGL::UpdateData(), because instance of TextureCubeArray_GL
                     // is not fully constructed yet.
                     // To call the required function, we need to explicitly specify the class:
-                    TextureCubeArray_OGL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
+                    TextureCubeArray_GL::UpdateData(GLState, Mip, Slice, DstBox, pInitData->pSubResources[Slice * m_Desc.MipLevels + Mip]);
                 }
             }
         }
@@ -115,14 +115,14 @@ TextureCubeArray_OGL::TextureCubeArray_OGL(IReferenceCounters*        pRefCounte
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-TextureCubeArray_OGL::TextureCubeArray_OGL(IReferenceCounters*        pRefCounters,
-                                           FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                           RenderDeviceGLImpl*        pDeviceGL,
-                                           GLContextState&            GLState,
-                                           const TextureDesc&         TexDesc,
-                                           GLuint                     GLTextureHandle,
-                                           GLuint                     GLBindTarget,
-                                           bool                       bIsDeviceInternal) :
+TextureCubeArray_GL::TextureCubeArray_GL(IReferenceCounters*        pRefCounters,
+                                         FixedBlockMemoryAllocator& TexViewObjAllocator,
+                                         RenderDeviceGLImpl*        pDeviceGL,
+                                         GLContextState&            GLState,
+                                         const TextureDesc&         TexDesc,
+                                         GLuint                     GLTextureHandle,
+                                         GLuint                     GLBindTarget,
+                                         bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -139,15 +139,15 @@ TextureCubeArray_OGL::TextureCubeArray_OGL(IReferenceCounters*        pRefCounte
 {
 }
 
-TextureCubeArray_OGL::~TextureCubeArray_OGL()
+TextureCubeArray_GL::~TextureCubeArray_GL()
 {
 }
 
-void TextureCubeArray_OGL::UpdateData(GLContextState&          ContextState,
-                                      Uint32                   MipLevel,
-                                      Uint32                   Slice,
-                                      const Box&               DstBox,
-                                      const TextureSubResData& SubresData)
+void TextureCubeArray_GL::UpdateData(GLContextState&          ContextState,
+                                     Uint32                   MipLevel,
+                                     Uint32                   Slice,
+                                     const Box&               DstBox,
+                                     const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -256,7 +256,7 @@ void TextureCubeArray_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void TextureCubeArray_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void TextureCubeArray_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     // Same as for 2D array textures
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCube_GL.cpp
index 4caafac2..0f542b56 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureCube_GL.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "TextureCube_OGL.hpp"
+#include "TextureCube_GL.hpp"
 
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
@@ -39,13 +39,13 @@
 namespace Diligent
 {
 
-TextureCube_OGL::TextureCube_OGL(IReferenceCounters*        pRefCounters,
-                                 FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                 class RenderDeviceGLImpl*  pDeviceGL,
-                                 GLContextState&            GLState,
-                                 const TextureDesc&         TexDesc,
-                                 const TextureData*         pInitData /*= nullptr*/,
-                                 bool                       bIsDeviceInternal /*= false*/) :
+TextureCube_GL::TextureCube_GL(IReferenceCounters*        pRefCounters,
+                               FixedBlockMemoryAllocator& TexViewObjAllocator,
+                               class RenderDeviceGLImpl*  pDeviceGL,
+                               GLContextState&            GLState,
+                               const TextureDesc&         TexDesc,
+                               const TextureData*         pInitData /*= nullptr*/,
+                               bool                       bIsDeviceInternal /*= false*/) :
     // clang-format off
     TextureBaseGL
     {
@@ -96,10 +96,10 @@ TextureCube_OGL::TextureCube_OGL(IReferenceCounters*        pRefCounters,
                     Box DstBox{0, std::max(m_Desc.Width >> Mip, 1U),
                                0, std::max(m_Desc.Height >> Mip, 1U)};
                     // UpdateData() is a virtual function. If we try to call it through vtbl from here,
-                    // we will get into TextureBaseGL::UpdateData(), because instance of TextureCube_OGL
+                    // we will get into TextureBaseGL::UpdateData(), because instance of TextureCube_GL
                     // is not fully constructed yet.
                     // To call the required function, we need to explicitly specify the class:
-                    TextureCube_OGL::UpdateData(GLState, Mip, Face, DstBox, pInitData->pSubResources[Face * m_Desc.MipLevels + Mip]);
+                    TextureCube_GL::UpdateData(GLState, Mip, Face, DstBox, pInitData->pSubResources[Face * m_Desc.MipLevels + Mip]);
                 }
             }
         }
@@ -113,14 +113,14 @@ TextureCube_OGL::TextureCube_OGL(IReferenceCounters*        pRefCounters,
     GLState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-TextureCube_OGL::TextureCube_OGL(IReferenceCounters*        pRefCounters,
-                                 FixedBlockMemoryAllocator& TexViewObjAllocator,
-                                 RenderDeviceGLImpl*        pDeviceGL,
-                                 GLContextState&            GLState,
-                                 const TextureDesc&         TexDesc,
-                                 GLuint                     GLTextureHandle,
-                                 GLuint                     GLBindTarget,
-                                 bool                       bIsDeviceInternal) :
+TextureCube_GL::TextureCube_GL(IReferenceCounters*        pRefCounters,
+                               FixedBlockMemoryAllocator& TexViewObjAllocator,
+                               RenderDeviceGLImpl*        pDeviceGL,
+                               GLContextState&            GLState,
+                               const TextureDesc&         TexDesc,
+                               GLuint                     GLTextureHandle,
+                               GLuint                     GLBindTarget,
+                               bool                       bIsDeviceInternal) :
     // clang-format off
     TextureBaseGL
     {
@@ -137,7 +137,7 @@ TextureCube_OGL::TextureCube_OGL(IReferenceCounters*        pRefCounters,
 {
 }
 
-TextureCube_OGL::~TextureCube_OGL()
+TextureCube_GL::~TextureCube_GL()
 {
 }
 
@@ -155,11 +155,11 @@ static constexpr GLenum CubeMapFaces[6] =
 };
 // clang-format on
 
-void TextureCube_OGL::UpdateData(GLContextState&          ContextState,
-                                 Uint32                   MipLevel,
-                                 Uint32                   Slice,
-                                 const Box&               DstBox,
-                                 const TextureSubResData& SubresData)
+void TextureCube_GL::UpdateData(GLContextState&          ContextState,
+                                Uint32                   MipLevel,
+                                Uint32                   Slice,
+                                const Box&               DstBox,
+                                const TextureSubResData& SubresData)
 {
     TextureBaseGL::UpdateData(ContextState, MipLevel, Slice, DstBox, SubresData);
 
@@ -263,7 +263,7 @@ void TextureCube_OGL::UpdateData(GLContextState&          ContextState,
     ContextState.BindTexture(-1, m_BindTarget, GLObjectWrappers::GLTextureObj::Null());
 }
 
-void TextureCube_OGL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
+void TextureCube_GL::AttachToFramebuffer(const TextureViewDesc& ViewDesc, GLenum AttachmentPoint)
 {
     if (ViewDesc.NumArraySlices == m_Desc.ArraySize)
     {