blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix frame-buffer texture creation 

- disable depth buffer didn't work.
- push/pop viewport bit was needed.
This commit is contained in:
Clément Foucault 2018-04-20 20:51:54 +02:00 committed by Campbell Barton
parent 6dc50bc25a
commit be648680c7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpu/intern/gpu_framebuffer.c
View File

@ -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;
}