[Libreoffice-commits] core.git: external/skia

[Mike Kaganski (via logerrit)]

 external/skia/fix-pch.patch.1 |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 07b84ff631bd3c8db1188f69804036505753feff
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jan 31 19:39:27 2020 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Feb 1 07:53:21 2020 +0100

    Skia: fix #define MemoryBarrier coming from winnt.h from pch
    
    ... resulting in error message
    
    C:/lo/src/build/workdir/UnpackedTarball/skia/src/gpu/gl/GrGLGpu.cpp(3771):
    error C2039: 'f__faststorefence': is not a member of 'GrGLInterface::Functions'
    
    Change-Id: If69c0067abe287dd276c685cde6be3b31a1ce950
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87780
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 11292572c555..1322f6dc24f8 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -122,3 +122,16 @@ index b8fd426e13..5e6f2a9b28 100755
          auto near = [&](skvm::F32 t) {
              // 1/18 + 9/18t + 27/18t^2 - 21/18t^3 == t ( t ( -21/18t + 27/18) + 9/18) + 1/18
              return p->mad(t,
+diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
+index 191b6a3ce5..26754acccd 100644
+--- a/src/gpu/gl/GrGLGpu.cpp
++++ b/src/gpu/gl/GrGLGpu.cpp
+@@ -3766,6 +3766,8 @@
+     }
+ }
+ 
++#undef MemoryBarrier
++
+ void GrGLGpu::insertManualFramebufferBarrier() {
+     SkASSERT(this->caps()->requiresManualFBBarrierAfterTessellatedStencilDraw());
+     GL_CALL(MemoryBarrier(GR_GL_FRAMEBUFFER_BARRIER_BIT));