GL: Flush after framebuffer change on Mac 9th gen Intel GPUs

include/platform/FeaturesGL.h

@@ -549,6 +549,12 @@ struct FeaturesGL : FeatureSetBase
                                         FeatureCategory::OpenGLWorkarounds,
                                         "Imagination GL drivers are buggy with context switching.",
                                         &members, "http://crbug.com/1181193"};
+
+    Feature flushOnFramebufferChange = {"flush_on_framebuffer_change",
+                                        FeatureCategory::OpenGLWorkarounds,
+                                        "Switching framebuffers without a flush can lead to "
+                                        "crashes on Intel 9th Generation GPU Macs.",
+                                        &members, "http://crbug.com/1181068"};
 };
 
 inline FeaturesGL::FeaturesGL()  = default;

src/libANGLE/renderer/driver_utils.cpp

@@ -146,6 +146,11 @@ bool IsKabylake(uint32_t DeviceId)
     return std::find(std::begin(Kabylake), std::end(Kabylake), DeviceId) != std::end(Kabylake);
 }
 
+bool Is9thGenIntel(uint32_t DeviceId)
+{
+    return IsSkylake(DeviceId) || IsBroxton(DeviceId) || IsKabylake(DeviceId);
+}
+
 const char *GetVendorString(uint32_t vendorId)
 {
     switch (vendorId)

src/libANGLE/renderer/driver_utils.h

@@ -152,6 +152,7 @@ bool IsCherryView(uint32_t DeviceId);
 bool IsSkylake(uint32_t DeviceId);
 bool IsBroxton(uint32_t DeviceId);
 bool IsKabylake(uint32_t DeviceId);
+bool Is9thGenIntel(uint32_t DeviceId);
 
 // Platform helpers
 inline bool IsWindows()

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -657,6 +657,7 @@ angle::Result StateManagerGL::setPixelPackBuffer(const gl::Context *context,
 
 void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
 {
+    bool framebufferChanged = false;
     switch (type)
     {
         case GL_FRAMEBUFFER:
@@ -669,6 +670,8 @@ void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
 
                 mLocalDirtyBits.set(gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
                 mLocalDirtyBits.set(gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
+
+                framebufferChanged = true;
             }
             break;
 
@@ -680,6 +683,8 @@ void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
                 mFunctions->bindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
 
                 mLocalDirtyBits.set(gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
+
+                framebufferChanged = true;
             }
             break;
 
@@ -691,6 +696,8 @@ void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
                 mFunctions->bindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer);
 
                 mLocalDirtyBits.set(gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
+
+                framebufferChanged = true;
             }
             break;
 
@@ -698,6 +705,11 @@ void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
             UNREACHABLE();
             break;
     }
+
+    if (framebufferChanged && mFeatures.flushOnFramebufferChange.enabled)
+    {
+        mFunctions->flush();
+    }
 }
 
 void StateManagerGL::bindRenderbuffer(GLenum type, GLuint renderbuffer)

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -1800,6 +1800,19 @@ bool GetSystemInfoVendorIDAndDeviceID(const FunctionsGL *functions,
     return isGetSystemInfoSuccess;
 }
 
+bool Has9thGenIntelGPU(const angle::SystemInfo &systemInfo)
+{
+    for (const angle::GPUDeviceInfo &deviceInfo : systemInfo.gpus)
+    {
+        if (IsIntel(deviceInfo.vendorId) && Is9thGenIntel(deviceInfo.deviceId))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *features)
 {
     angle::VendorID vendor;
@@ -2100,6 +2113,10 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
     // Imagination drivers are buggy with context switching. It needs to unbind fbo before context
     // switching to workadround the driver issues.
     ANGLE_FEATURE_CONDITION(features, unbindFBOOnContextSwitch, IsPowerVR(vendor));
+
+    // http://crbug.com/1181068 and http://crbug.com/783979
+    ANGLE_FEATURE_CONDITION(features, flushOnFramebufferChange,
+                            IsApple() && Has9thGenIntelGPU(systemInfo));
 }
 
 void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)