OpenGL: Consolidate depth–stencil buffers (Strategy 2) (#7360)

* Remove redundant unused stencil code

* switch Back_depth_texture to GL_DEPTH24_STENCIL8

* manage the clang-tidy error

* Remove redundancies and possible handle shutdown leaks

Author: LuytenFS

code/graphics/opengl/gropengldraw.cpp

@@ -47,12 +47,10 @@ GLuint Scene_luminance_texture;
 GLuint Scene_depth_texture;
 GLuint Scene_depth_texture_ms;
 GLuint Cockpit_depth_texture;
-GLuint Scene_stencil_buffer;
 
 GLuint Back_framebuffer;
 GLuint Back_texture;
 GLuint Back_depth_texture;
-GLuint Back_stencil_buffer;
 
 GLuint Distortion_framebuffer = 0;
 GLuint Distortion_texture[2];
@@ -284,10 +282,18 @@ void opengl_setup_scene_textures()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
 
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, Scene_texture_width, Scene_texture_height, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+	glTexImage2D(GL_TEXTURE_2D,
+		0,
+		GL_DEPTH24_STENCIL8,
+		Scene_texture_width,
+		Scene_texture_height,
+		0,
+		GL_DEPTH_COMPONENT,
+		GL_FLOAT,
+		nullptr);
 	opengl_set_object_label(GL_TEXTURE, Cockpit_depth_texture, "Cockpit depth texture");
 
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, Cockpit_depth_texture, 0);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, Cockpit_depth_texture, 0);
 	gr_zbuffer_set(GR_ZBUFF_FULL);
 	glClear(GL_DEPTH_BUFFER_BIT);
 
@@ -305,15 +311,17 @@ void opengl_setup_scene_textures()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
 
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, Scene_texture_width, Scene_texture_height, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+	glTexImage2D(GL_TEXTURE_2D,
+		0,
+		GL_DEPTH24_STENCIL8,
+		Scene_texture_width,
+		Scene_texture_height,
+		0,
+		GL_DEPTH_COMPONENT,
+		GL_FLOAT,
+		nullptr);
 	opengl_set_object_label(GL_TEXTURE, Scene_depth_texture, "Scene depth texture");
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, Scene_depth_texture, 0);
-
-	//setup main stencil buffer
-	glGenRenderbuffers(1, &Scene_stencil_buffer);
-    glBindRenderbuffer(GL_RENDERBUFFER, Scene_stencil_buffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, Scene_texture_width, Scene_texture_height);
-	//glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, Scene_stencil_buffer);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, Scene_depth_texture, 0);
 
 	glReadBuffer(GL_COLOR_ATTACHMENT0);
 
@@ -492,13 +500,13 @@ void opengl_setup_scene_textures()
 
 		glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE,
 			Cmdline_msaa_enabled,
-			GL_DEPTH_COMPONENT24,
+			GL_DEPTH24_STENCIL8,
 			Scene_texture_width,
 			Scene_texture_height,
 			GL_TRUE);
 		opengl_set_object_label(GL_TEXTURE, Scene_depth_texture_ms, "Scene depth texture multisample");
 		glFramebufferTexture2D(GL_FRAMEBUFFER,
-			GL_DEPTH_ATTACHMENT,
+			GL_DEPTH_STENCIL_ATTACHMENT,
 			GL_TEXTURE_2D_MULTISAMPLE,
 			Scene_depth_texture_ms,
 			0);
@@ -546,17 +554,20 @@ void opengl_setup_scene_textures()
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
 
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, gr_screen.max_w, gr_screen.max_h, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+		glTexImage2D(GL_TEXTURE_2D,
+			0,
+			GL_DEPTH24_STENCIL8,
+			gr_screen.max_w,
+			gr_screen.max_h,
+			0,
+			GL_DEPTH_STENCIL,
+			GL_UNSIGNED_INT_24_8,
+			nullptr);
 		opengl_set_object_label(GL_TEXTURE, Back_depth_texture, "Backbuffer depth texture");
 
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, Back_depth_texture, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, Back_depth_texture, 0);
 		gr_zbuffer_set(GR_ZBUFF_FULL);
 		glClear(GL_DEPTH_BUFFER_BIT);
-
-		glGenRenderbuffers(1, &Back_stencil_buffer);
-		glBindRenderbuffer(GL_RENDERBUFFER, Back_stencil_buffer);
-		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, gr_screen.max_w, gr_screen.max_h);
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, Back_stencil_buffer);
 	}
 
 	//Setup thruster distortion framebuffer
@@ -660,6 +671,21 @@ void opengl_scene_texture_shutdown()
 		Scene_framebuffer = 0;
 	}
 
+	if (Back_texture) {
+		glDeleteTextures(1, &Back_texture);
+		Back_texture = 0;
+	}
+
+	if (Back_depth_texture) {
+		glDeleteTextures(1, &Back_depth_texture);
+		Back_depth_texture = 0;
+	}
+
+	if (Back_framebuffer) {
+		glDeleteFramebuffers(1, &Back_framebuffer);
+		Back_framebuffer = 0;
+	}
+	
 	glDeleteTextures(2, Distortion_texture);
 	Distortion_texture[0] = 0;
 	Distortion_texture[1] = 0;

code/graphics/opengl/gropengldraw.h

@@ -35,7 +35,6 @@ extern GLuint Scene_composite_texture;
 extern GLuint Scene_depth_texture;
 extern GLuint Scene_depth_texture_ms;
 extern GLuint Cockpit_depth_texture;
-extern GLuint Scene_stencil_buffer;
 
 extern GLuint Back_framebuffer;
 extern GLuint Back_texture;