From fedbf9a31ea5facd688f0fa94aafac11780e8b4a Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Thu, 2 Mar 2023 15:31:10 +0100
Subject: [PATCH] Remove unused textures

---
 modules/base/rendering/renderablemodel.cpp | 24 ++--------------------
 modules/base/rendering/renderablemodel.h   |  3 +--
 modules/base/shaders/modelOpacity_fs.glsl  |  4 ----
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 7ffd74c943..52185f2545 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -79,9 +79,8 @@ namespace {
         "specularIntensity", "performManualDepthTest", "gBufferDepthTexture"
     };
 
-    constexpr std::array<const char*, 5> UniformOpacityNames = {
-        "opacity", "colorTexture", "depthTexture", "positionTexture",
-        "normalTexture"
+    constexpr std::array<const char*, 3> UniformOpacityNames = {
+        "opacity", "colorTexture", "depthTexture"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableAnimationInfo = {
@@ -860,25 +859,6 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
         );
         _quadProgram->setUniform(_uniformOpacityCache.colorTexture, colorTextureUnit);
 
-        ghoul::opengl::TextureUnit positionTextureUnit;
-        positionTextureUnit.activate();
-        glBindTexture(
-            GL_TEXTURE_2D,
-            global::renderEngine->renderer()->additionalColorTexture2()
-        );
-        _quadProgram->setUniform(
-            _uniformOpacityCache.positionTexture,
-            positionTextureUnit
-        );
-
-        ghoul::opengl::TextureUnit normalTextureUnit;
-        normalTextureUnit.activate();
-        glBindTexture(
-            GL_TEXTURE_2D,
-            global::renderEngine->renderer()->additionalColorTexture3()
-        );
-        _quadProgram->setUniform(_uniformOpacityCache.normalTexture, normalTextureUnit);
-
         ghoul::opengl::TextureUnit depthTextureUnit;
         depthTextureUnit.activate();
         glBindTexture(
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 0ef9d8041f..eafd558810 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -122,8 +122,7 @@ private:
 
     // Opacity program
     ghoul::opengl::ProgramObject* _quadProgram = nullptr;
-    UniformCache(opacity, colorTexture, depthTexture, positionTexture,
-        normalTexture) _uniformOpacityCache;
+    UniformCache(opacity, colorTexture, depthTexture) _uniformOpacityCache;
 
     // Store the original RenderBin
     Renderable::RenderBin _originalRenderBin;
diff --git a/modules/base/shaders/modelOpacity_fs.glsl b/modules/base/shaders/modelOpacity_fs.glsl
index a9a0da3281..1f19bef9ec 100644
--- a/modules/base/shaders/modelOpacity_fs.glsl
+++ b/modules/base/shaders/modelOpacity_fs.glsl
@@ -31,8 +31,6 @@ uniform float opacity = 1.0;
 
 uniform sampler2D colorTexture;
 uniform sampler2D depthTexture;
-uniform sampler2D positionTexture;
-uniform sampler2D normalTexture;
 
 Fragment getFragment() {
   Fragment frag;
@@ -46,8 +44,6 @@ Fragment getFragment() {
   frag.color.a = opacity * textureColor.a;
 
   frag.depth = denormalizeFloat(texture(depthTexture, vs_st).x);
-  frag.gPosition = texture(positionTexture, vs_st);
-  frag.gNormal = vec4(texture(normalTexture, vs_st).rgb, 0.0);
   frag.disableLDR2HDR = true;
 
   return frag;