diff options
| author | thakis <thakis@chromium.org> | 2015-09-02 17:35:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-03 00:36:59 +0000 |
| commit | a3ce89c68f8d70a7047fe5d2fbcf5819fa95b7d0 (patch) | |
| tree | f048cdb6ed57fc01d392e34401bfc0083a21c445 /gpu/BUILD.gn | |
| parent | 527fca133045a8ee21d09b7d2793d4c25e500b86 (diff) | |
| download | chromium_src-a3ce89c68f8d70a7047fe5d2fbcf5819fa95b7d0.zip chromium_src-a3ce89c68f8d70a7047fe5d2fbcf5819fa95b7d0.tar.gz chromium_src-a3ce89c68f8d70a7047fe5d2fbcf5819fa95b7d0.tar.bz2 | |
Revert of Add command_buffer_gles2 (patchset #14 id:310001 of https://codereview.chromium.org/1220883008/ )
Reason for revert:
Doesn't build on 64-bit Windows gn:
http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/builds/1743
FAILED: C:/b/depot_tools/python276_bin/python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:./command_buffer_gles2.dll.lib /DLL /OUT:./command_buffer_gles2.dll /PDB:./command_buffer_gles2.dll.pdb @./command_buffer_gles2.dll.rsp
gpu.dll.lib(gpu.dll) :error LNK2005: "public: __cdecl gpu::gles2::GLES2CmdHelper::GLES2CmdHelper(class gpu::CommandBuffer *)" (??0GLES2CmdHelper@gles2@gpu@@QEAA@PEAVCommandBuffer@2@@Z) already defined in gles2_cmd_helper.obj
gpu.dll.lib(gpu.dll) :error LNK2005: "public: bool __cdecl gpu::CommandBufferHelper::Initialize(int)" (?Initialize@CommandBufferHelper@gpu@@QEAA_NH@Z) already defined in cmd_buffer_helper.obj
gpu.dll.lib(gpu.dll) :error LNK2005: "public: __cdecl gpu::TransferBuffer::TransferBuffer(class gpu::CommandBufferHelper *)" (??0TransferBuffer@gpu@@QEAA@PEAVCommandBufferHelper@1@@Z) already defined in transfer_buffer.obj
gpu.dll.lib(gpu.dll) :error LNK2005: "public: void __cdecl base::RefCounted<class gpu::ValueStateMap>::Release(void)const " (?Release@?$RefCounted@VValueStateMap@gpu@@@base@@QEBAXXZ) already defined in value_state.obj
gpu.dll.lib(gpu.dll) :error LNK2005: "public: void __cdecl base::RefCounted<class gpu::ValueStateMap>::AddRef(void)const " (?AddRef@?$RefCounted@VValueStateMap@gpu@@@base@@QEBAXXZ) already defined in value_state.obj
Original issue's description:
> Add command_buffer_gles2
>
> This is a very simple library that exposes some egl-like functions that
> can be used by skia to use the command buffer as a backend for their
> tests
>
> Committed: https://crrev.com/604b615373e4e9f873db37cef9c6416176fc35f3
> Cr-Commit-Position: refs/heads/master@{#346251}
>
> Committed: https://crrev.com/efa3a446183fbbff2034a03989f12543d0713e39
> Cr-Commit-Position: refs/heads/master@{#346840}
>
> Committed: https://crrev.com/d65c55dac3f47e9a237579eb6f5fe31e19ca4704
> Cr-Commit-Position: refs/heads/master@{#347013}
TBR=piman@chromium.org,dpranke@chromium.org,sievers@chromium.org,hendrikw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1318933006
Cr-Commit-Position: refs/heads/master@{#347069}
Diffstat (limited to 'gpu/BUILD.gn')
| -rw-r--r-- | gpu/BUILD.gn | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index c5e8bd7..2668617 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -49,37 +49,6 @@ component("gpu") { ] } -# GYP version: //gpu/gpu.gyp:command_buffer_gles2 -shared_library("command_buffer_gles2") { - sources = [ - # TODO(hendrikw): Move egl out of gles2_conform_support. - "gles2_conform_support/egl/config.cc", - "gles2_conform_support/egl/config.h", - "gles2_conform_support/egl/display.cc", - "gles2_conform_support/egl/display.h", - "gles2_conform_support/egl/egl.cc", - "gles2_conform_support/egl/surface.cc", - "gles2_conform_support/egl/surface.h", - ] - - deps = [ - "//base", - "//gpu/command_buffer/client:client_sources", - "//gpu/command_buffer/client:gles2_c_lib", - "//gpu/command_buffer/client:gles2_cmd_helper_sources", - "//gpu/command_buffer/client:gles2_implementation", - "//gpu/command_buffer/service", - "//ui/gl:gl", - ] - - defines = [ "EGLAPIENTRY=" ] - if (current_os == "win") { - defines += [ "EGLAPI=__declspec(dllexport)" ] - } else { - defines += [ "EGLAPI=__attribute__((visibility(\"default\")))" ] - } -} - source_set("test_support") { testonly = true sources = [ |