[Bf-blender-cvs] [be648680c75] blender2.8: Fix frame-buffer texture creation

[Clément Foucault]

Commit: be648680c7542c161cf4709846b88bf6c480e2fe
Author: Clément Foucault
Date:   Fri Apr 20 20:51:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbe648680c7542c161cf4709846b88bf6c480e2fe

Fix frame-buffer texture creation

- disable depth buffer didn't work.
- push/pop viewport bit was needed.

===================================================================

M	source/blender/gpu/intern/gpu_framebuffer.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index cb23b436fcb..73a1f14b9f6 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -664,11 +664,13 @@ GPUOffScreen *GPU_offscreen_create(int width, int height, int samples, bool dept
 		ofs->depth = GPU_texture_create_depth_with_stencil_multisample(width, height, samples, err_out);
 	}
 
-	if (!ofs->depth || !ofs->color) {
+	if ((depth && !ofs->depth) || !ofs->color) {
 		GPU_offscreen_free(ofs);
 		return NULL;
 	}
-	
+
+	gpuPushAttrib(GPU_VIEWPORT_BIT);
+
 	GPU_framebuffer_ensure_config(&ofs->fb, {
 		GPU_ATTACHMENT_TEXTURE(ofs->depth),
 		GPU_ATTACHMENT_TEXTURE(ofs->color)
@@ -677,11 +679,14 @@ GPUOffScreen *GPU_offscreen_create(int width, int height, int samples, bool dept
 	/* check validity at the very end! */
 	if (!GPU_framebuffer_check_valid(ofs->fb, err_out)) {
 		GPU_offscreen_free(ofs);
+		gpuPopAttrib();
 		return NULL;		
 	}
 
 	GPU_framebuffer_restore();
 
+	gpuPopAttrib();
+
 	return ofs;
 }