archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix crash with computers not supporting high quality depth of field.

Browse Source
This commit is contained in:
Antonis Ryakiotakis
2015-03-25 14:43:28 +01:00
parent 1c329af74c
commit 1a866d55ac
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,12 @@ bool GPU_fx_compositor_initialize_passes(
/* create textures for dof effect */
if (fx_flag & GPU_FX_FLAG_DOF) {
bool dof_high_quality = (fx_settings->dof->high_quality != 0);
bool dof_high_quality = (fx_settings->dof->high_quality != 0) &&
GPU_geometry_shader_support() && GPU_instanced_drawing_support();
/* cleanup buffers if quality setting has changed (no need to keep more buffers around than necessary ) */
if (dof_high_quality != fx->dof_high_quality)
cleanup_fx_dof_buffers(fx);
if (dof_high_quality) {
fx->dof_downsampled_w = w / 2;
@@ -469,7 +474,7 @@ bool GPU_fx_compositor_initialize_passes(
}
}
fx->dof_high_quality = dof_high_quality && GPU_geometry_shader_support() && GPU_instanced_drawing_support();
fx->dof_high_quality = dof_high_quality;
}
else {
/* cleanup unnecessary buffers */