Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Issue 927753002: Revert of Roll ANGLE 592ab9dd91e..4085347266. (Closed)

Created:
5 years, 10 months ago by Nico
Modified:
5 years, 10 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Roll ANGLE 592ab9dd91e..4085347266. (patchset #1 id:1 of https://codereview.chromium.org/925693002/) Reason for revert: Caused all kinds of build issues on the clang/win bots (try/catch are used, a few DISALLOW_COPY_AND_ASSSIGNs are qualified, and something about const params): http://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/builds/968/steps/compile/logs/stdio ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(94,5) : error: expected member name or ';' after declaration specifiers DISALLOW_COPY_AND_ASSIGN(Buffer11::BufferStorage); ^ ~~~~~~~~~~~~~~~~~~~~~~~ ..\..\third_party\angle\src\common/angleutils.h(25,14) : note: expanded from macro 'DISALLOW_COPY_AND_ASSIGN' TypeName(const TypeName&) = delete; \ ^ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(94,5) : error: expected ')' (Probable fix: Drop the qualifier, and move it into the inner class if it's not there already) ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(124,40) : error: non-friend class member 'NativeStorage' cannot have a qualified name DISALLOW_COPY_AND_ASSIGN(Buffer11::NativeStorage); ~~~~~~~~~~^ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(124,40) : error: non-friend class member 'NativeStorage' cannot have a qualified name DISALLOW_COPY_AND_ASSIGN(Buffer11::NativeStorage); ~~~~~~~~~~^ Then a few of these: ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(211,9) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' if (stagingBuffer->getDataRevision() > mResolvedDataRevision) ^~~~~~~~~~~~~ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(213,13) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' if (stagingBuffer->getSize() > mResolvedData.size()) ^~~~~~~~~~~~~ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(215,39) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' if (!mResolvedData.resize(stagingBuffer->getSize())) ^~~~~~~~~~~~~ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(230,60) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' memcpy(mResolvedData.data(), mappedResource.pData, stagingBuffer->getSize()); ^~~~~~~~~~~~~ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(234,33) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' mResolvedDataRevision = stagingBuffer->getDataRevision(); ^~~~~~~~~~~~~ ..\..\third_party\angle\src\libANGLE\renderer\d3d\d3d11\Buffer11.cpp(269,13) : error: cannot initialize object parameter of type 'const rx::Buffer11::BufferStorage' with an expression of type 'rx::Buffer11::NativeStorage' if (stagingBuffer->getSize() < requiredSize) ^~~~~~~~~~~~~ And a bunch of these: In file included from ..\..\third_party\angle\src\libANGLE\renderer\d3d\ProgramD3D.cpp:14: In file included from C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\future:11: In file included from C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\functional:6: In file included from C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\xfunctional:7: C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\xstring(2214,3) : error: cannot compile this try statement yet _TRY_BEGIN ^~~~~~~~~~ C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\xstddef(30,21) : note: expanded from macro '_TRY_BEGIN' #define _TRY_BEGIN try { ^ Sorry about reverting something for an FYI bot, but the bot's been red all day for various reasons, and I'd like it to be green over the long weekend. I'll try a local build with the roll patched in and I'll send you fixes for the issues, to make up for it a bit. Original issue's description: > Roll ANGLE 592ab9dd91e..4085347266. > > https://chromium.googlesource.com/angle/angle/+log/592ab9dd91e..4085347266 > > BUG=391957, 436191, 450257, 447419, 452587, 453543 > R=zmo@chromium.org,bajones@chromium.org > > Committed: https://crrev.com/8e556e6de2c40fbf7379056facb6c9fa5f508f3e > Cr-Commit-Position: refs/heads/master@{#316292} TBR=bajones@chromium.org,zmo@chromium.org,jmadill@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=391957, 436191, 450257, 447419, 452587, 453543 Committed: https://crrev.com/277a85894d7df282535eaddf155998c93c102af5 Cr-Commit-Position: refs/heads/master@{#316324}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M DEPS View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 6 (0 generated)
Nico
Created Revert of Roll ANGLE 592ab9dd91e..4085347266.
5 years, 10 months ago (2015-02-13 23:30:28 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/927753002/1
5 years, 10 months ago (2015-02-13 23:31:24 UTC) #2
bajones
lgtm
5 years, 10 months ago (2015-02-13 23:31:32 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 10 months ago (2015-02-13 23:32:27 UTC) #4
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/277a85894d7df282535eaddf155998c93c102af5 Cr-Commit-Position: refs/heads/master@{#316324}
5 years, 10 months ago (2015-02-13 23:33:11 UTC) #5
Nico
5 years, 10 months ago (2015-02-13 23:57:40 UTC) #6
Message was sent while issue was closed.
https://chromium-review.googlesource.com/#/c/249921/ fixes all issues in
Buffer11.cpp.

The exception errors are from 310184861bab5e95139e0f34b1f8e88fe8c677b8 which
added

// <future> requires _HAS_EXCEPTIONS to be defined
#ifdef _HAS_EXCEPTIONS
#undef _HAS_EXCEPTIONS
#endif // _HAS_EXCEPTIONS
#define _HAS_EXCEPTIONS 1

to ProgramD3D.cpp. clang can't do C++ exceptions yet, and we don't use them
anywhere else in chromium. I don't have great advice here other than "don't use
c++11 library stuff yet" like I said on that review (but I didn't realize this
would break the clang build there).

With https://chromium-review.googlesource.com/#/c/249921/ and without the
_HAS_EXCEPTIONS stuff in ProgramD3D.cpp, things build fine for me locally.

Again, sorry about the revert!

Powered by Google App Engine
This is Rietveld 408576698