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

Issue 925693002: Roll ANGLE 592ab9dd91e..4085347266. (Closed)

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

Description

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: 13 (4 generated)
Jamie Madill
PTAL
5 years, 10 months ago (2015-02-13 16:24:17 UTC) #1
bajones
lgtm
5 years, 10 months ago (2015-02-13 19:35:34 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/925693002/1
5 years, 10 months ago (2015-02-13 19:37:41 UTC) #4
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/24986)
5 years, 10 months ago (2015-02-13 20:41:44 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/925693002/1
5 years, 10 months ago (2015-02-13 21:28:03 UTC) #8
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 10 months ago (2015-02-13 21:28:53 UTC) #9
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/8e556e6de2c40fbf7379056facb6c9fa5f508f3e Cr-Commit-Position: refs/heads/master@{#316292}
5 years, 10 months ago (2015-02-13 21:29:23 UTC) #10
Nico
Can we revert this? This doesn't build on the clang/win bots and they've been red ...
5 years, 10 months ago (2015-02-13 23:19:10 UTC) #12
Nico
5 years, 10 months ago (2015-02-13 23:30:27 UTC) #13
Message was sent while issue was closed.
A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/927753002/ by thakis@chromium.org.

The reason for reverting is: 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/build...

..\..\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..

Powered by Google App Engine
This is Rietveld 408576698