Changeset 251037 in webkit


Ignore:
Timestamp:
Oct 11, 2019 7:57:11 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

USE_ANGLE=1 build broken with last ANGLE roll
​https://bugs.webkit.org/show_bug.cgi?id=202872

Add FrameCapture_mock.cpp to Xcode and CMake builds.

Patch by Kenneth Russell <​kbr@chromium.org> on 2019-10-11
Reviewed by Alex Christensen.

  • ANGLE.xcodeproj/project.pbxproj:
  • CMakeLists.txt:
  • GLESv2.cmake:
Location:
trunk/Source/ThirdParty/ANGLE
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

    r251018 r251037  
    578578                6E344AB622BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E344AB422BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp */; };
    579579                6E344AB722BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E344AB522BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h */; };
     580                6EA0D69323515A5C00B8651F /* FrameCapture_mock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EA0D69223515A5C00B8651F /* FrameCapture_mock.cpp */; };
    580581                6ED70A0C22CD630E008688CE /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0922CD630E008688CE /* gl.h */; settings = {ATTRIBUTES = (Public, ); }; };
    581582                6ED70A0D22CD630E008688CE /* glext.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0A22CD630E008688CE /* glext.h */; settings = {ATTRIBUTES = (Public, ); }; };
    … …  
    13301331                6E344AB422BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entry_points_gles_1_0_autogen.cpp; sourceTree = "<group>"; };
    13311332                6E344AB522BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entry_points_gles_1_0_autogen.h; sourceTree = "<group>"; };
     1333                6EA0D69223515A5C00B8651F /* FrameCapture_mock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameCapture_mock.cpp; sourceTree = "<group>"; };
    13321334                6ED70A0922CD630E008688CE /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = include/GLES/gl.h; sourceTree = "<group>"; };
    13331335                6ED70A0A22CD630E008688CE /* glext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glext.h; path = include/GLES/glext.h; sourceTree = "<group>"; };
    … …  
    17791781                                5C1DBC6C1B0438D200235552 /* FramebufferAttachment.cpp */,
    17801782                                5C1DBC6D1B0438D200235552 /* FramebufferAttachment.h */,
     1783                                6EA0D69223515A5C00B8651F /* FrameCapture_mock.cpp */,
    17811784                                5CCD595D2284F7960018F2D8 /* GLES1Renderer.cpp */,
    17821785                                5CCD59522284F7940018F2D8 /* GLES1Renderer.h */,
    … …  
    30653068                                5C1DBDF51B0438D300235552 /* FramebufferAttachment.cpp in Sources */,
    30663069                                5CB301271DE39F1A00D2C405 /* FramebufferGL.cpp in Sources */,
     3070                                6EA0D69323515A5C00B8651F /* FrameCapture_mock.cpp in Sources */,
    30673071                                5C55D6E422826C7900B5BA2C /* FunctionLookup.cpp in Sources */,
    30683072                                5CB3012B1DE39F1A00D2C405 /* FunctionsGL.cpp in Sources */,

  • trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

    r251018 r251037  
    5858    ${angle_translator_glsl_sources}
    5959    ${angle_translator_sources}
    60     # Add this in if frame capture is desired, and add the appropriate
    61     # definitions.
    62     # ${libangle_capture_sources}
     60    ${libangle_capture_sources}
    6361)
    6462

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r251018 r251037  
     12019-10-11  Kenneth Russell  <kbr@chromium.org>
     2
     3        USE_ANGLE=1 build broken with last ANGLE roll
     4        https://bugs.webkit.org/show_bug.cgi?id=202872
     5
     6        Add FrameCapture_mock.cpp to Xcode and CMake builds.
     7
     8        Reviewed by Alex Christensen.
     9
     10        * ANGLE.xcodeproj/project.pbxproj:
     11        * CMakeLists.txt:
     12        * GLESv2.cmake:
     13
    1142019-10-11  Kenneth Russell  <kbr@chromium.org>
    215

  • trunk/Source/ThirdParty/ANGLE/GLESv2.cmake

    r251018 r251037  
    929929
    930930set(libangle_capture_sources
    931     src/libANGLE/FrameCapture.cpp
     931    # If frame capture support is desired, uncomment this, comment out
     932    # FrameCapture_mock.cpp, and set ANGLE_CAPTURE_ENABLED=1 in
     933    # ANGLE_DEFINITIONS.
     934    # src/libANGLE/FrameCapture.cpp
     935    src/libANGLE/FrameCapture_mock.cpp
    932936    src/libANGLE/capture_gles_1_0_autogen.cpp
    933937    src/libANGLE/capture_gles_1_0_params.cpp
Note: See TracChangeset for help on using the changeset viewer.