revert color_attachment_4/5 fbo workarounds

Author: Shivansps

code/graphics/opengl/gropengldeferred.cpp

@@ -88,22 +88,9 @@ void gr_opengl_deferred_lighting_begin(bool clearNonColorBufs)
 	} else {
 		// Copy the existing color data into the emissive part of the G-buffer since everything that already existed is
 		// treated as emissive
-		#ifndef USE_OPENGL_ES
 		glDrawBuffer(GL_COLOR_ATTACHMENT4);
 		glReadBuffer(GL_COLOR_ATTACHMENT0);
 		glBlitFramebuffer(0, 0, gr_screen.max_w, gr_screen.max_h, 0, 0, gr_screen.max_w, gr_screen.max_h, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-		#else
-		// one again ES does not consider GL_COLOR_ATTACHMENT4 as valid draw buffer
-		GLint prev_read_fbo = 0, prev_tex2d = 0;
-		glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &prev_read_fbo);
-		glGetIntegerv(GL_TEXTURE_BINDING_2D, &prev_tex2d);
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, Scene_framebuffer);
-		glReadBuffer(GL_COLOR_ATTACHMENT0);
-		glBindTexture(GL_TEXTURE_2D, Scene_emissive_texture);
-		glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, gr_screen.max_w, gr_screen.max_h);
-		glBindTexture(GL_TEXTURE_2D, prev_tex2d);
-		glBindFramebuffer(GL_READ_FRAMEBUFFER, prev_read_fbo);
-		#endif
 	}
 
 	glDrawBuffers(6, buffers);
@@ -244,7 +231,6 @@ void gr_opengl_deferred_lighting_finish()
 
 	opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_DEFERRED_LIGHTING, ENVMAP > 0 ? SDR_FLAG_ENV_MAP : 0));
 
-	#ifndef USE_OPENGL_ES
 	glDrawBuffer(GL_COLOR_ATTACHMENT5);
 	glReadBuffer(GL_COLOR_ATTACHMENT4);
 	glBlitFramebuffer(0,
@@ -257,18 +243,6 @@ void gr_opengl_deferred_lighting_finish()
 		gr_screen.max_h,
 		GL_COLOR_BUFFER_BIT,
 		GL_NEAREST);
-	#else
-	//Another case of ES not considering GL_COLOR_ATTACHMENT5 as valid draw buffer
-	GLint prev_read_fbo = 0, prev_tex2d = 0;
-	glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &prev_read_fbo);
-	glGetIntegerv(GL_TEXTURE_BINDING_2D, &prev_tex2d);
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, Scene_framebuffer);
-	glReadBuffer(GL_COLOR_ATTACHMENT4);
-	glBindTexture(GL_TEXTURE_2D, Scene_composite_texture);
-	glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, gr_screen.max_w, gr_screen.max_h);
-	glBindTexture(GL_TEXTURE_2D, prev_tex2d);
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, prev_read_fbo);
-	#endif
 
 	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_color_texture);
 	GL_state.Texture.Enable(1, GL_TEXTURE_2D, Scene_normal_texture);

code/graphics/opengl/gropengldraw.cpp

@@ -814,28 +814,11 @@ void gr_opengl_copy_effect_texture()
 		return;
 	}
 
-	#ifndef USE_OPENGL_ES
     //Make sure we're reading from the up-to-date color texture
     glReadBuffer(GL_COLOR_ATTACHMENT0);
 	glDrawBuffer(GL_COLOR_ATTACHMENT5);
 	glBlitFramebuffer(0, 0, gr_screen.max_w, gr_screen.max_h, 0, 0, gr_screen.max_w, gr_screen.max_h, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 	glDrawBuffer(GL_COLOR_ATTACHMENT0);
-	#else
-	// For some reason, ES considers glDrawBuffer(GL_COLOR_ATTACHMENT5) as invalid here
-	// try to copy to Scene_composite_texture in an alternative way
-	// save states
-	GLint prev_read_fbo = 0, prev_tex2d = 0;
-	glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &prev_read_fbo);
-	glGetIntegerv(GL_TEXTURE_BINDING_2D, &prev_tex2d);
-	// copy texture to scene_composite_texture
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, Scene_framebuffer);
-	glReadBuffer(GL_COLOR_ATTACHMENT0);
-	glBindTexture(GL_TEXTURE_2D, Scene_composite_texture);
-	glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, gr_screen.max_w, gr_screen.max_h);
-	// restore states
-	glBindTexture(GL_TEXTURE_2D, prev_tex2d);
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, prev_read_fbo);
-	#endif
 }
 
 void gr_opengl_render_shield_impact(shield_material* material_info,