diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-20 17:09:01 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-20 19:50:05 +0300 |
commit | 1b2ee3cf20777c737a116c44227b3193ae69cc74 (patch) | |
tree | 9d81d78857897c384ed5ecafd597bb2fdaa21753 /source/blender/gpu/opengl/gl_texture.cc | |
parent | f2bb42a095acde57c540ff619c422132f491ef1c (diff) |
Fix T92090: Eevee crash with Intel HD 4000 and macOS 10.15.7
A recent security update to macOS 10.15.7 causes crashes when using Eevee and
various other 3D viewport features. It appears that glGenerateMipmap is
broken, causing a crash whenever its commands are flushed/submitted to the GPU.
Ideally this would be fixed in a driver update, however it's unlikely this will
happen. Earlier macOS versions have been receiving security updates for 2 years,
and that window has just passed for 10.15. Further, computers with these GPUs
can't upgrade to a newer macOS version.
As a workaround, disable mipmaps on these GPUs, by setting the mipmap max level
to 0 and not calling glGenerateMipmaps. Effects like depth of field also use
mipmaps, but fill in the mip levels by other means. In those cases we keep the
mipmap level.
Differential Revision: https://developer.blender.org/D13295
Diffstat (limited to 'source/blender/gpu/opengl/gl_texture.cc')
-rw-r--r-- | source/blender/gpu/opengl/gl_texture.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/gpu/opengl/gl_texture.cc b/source/blender/gpu/opengl/gl_texture.cc index db1fda63c28..f9c5a97a0bb 100644 --- a/source/blender/gpu/opengl/gl_texture.cc +++ b/source/blender/gpu/opengl/gl_texture.cc @@ -225,6 +225,8 @@ void GLTexture::update_sub_direct_state_access( break; } } + + has_pixels_ = true; } void GLTexture::update_sub( @@ -288,6 +290,8 @@ void GLTexture::update_sub( break; } } + + has_pixels_ = true; } /** @@ -307,6 +311,16 @@ void GLTexture::generate_mipmap() return; } + if (GLContext::generate_mipmap_workaround) { + /* Broken glGenerateMipmap, don't call it and render without mipmaps. + * If no top level pixels have been filled in, the levels will get filled by + * other means and there is no need to disable mipmapping. */ + if (has_pixels_) { + this->mip_range_set(0, 0); + } + return; + } + /* Down-sample from mip 0 using implementation. */ if (GLContext::direct_state_access_support) { glGenerateTextureMipmap(tex_id_); @@ -337,6 +351,8 @@ void GLTexture::clear(eGPUDataFormat data_format, const void *data) GPU_framebuffer_bind(prev_fb); } + + has_pixels_ = true; } void GLTexture::copy_to(Texture *dst_) @@ -363,6 +379,8 @@ void GLTexture::copy_to(Texture *dst_) GPU_framebuffer_blit( src->framebuffer_get(), 0, dst->framebuffer_get(), 0, to_framebuffer_bits(format_)); } + + has_pixels_ = true; } void *GLTexture::read(int mip, eGPUDataFormat type) @@ -452,6 +470,7 @@ struct GPUFrameBuffer *GLTexture::framebuffer_get() GPUTexture *gputex = reinterpret_cast<GPUTexture *>(static_cast<Texture *>(this)); framebuffer_ = GPU_framebuffer_create(name_); GPU_framebuffer_texture_attach(framebuffer_, gputex, 0, 0); + has_pixels_ = true; return framebuffer_; } |