Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
angle
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Chen Yisong
  • angle
  • Repository

Switch branch/tag
  • angle
  • src
  • libANGLE
  • renderer
  • d3d
  • d3d11
  • TextureStorage11.cpp
Find file
BlameHistoryPermalink
  • Jamie Madill's avatar
    Revert "Avoid a copy in TextureStorage11::setData" · 3a913264
    Jamie Madill authored Feb 06, 2016
    Fails on the Windows builders:
    
    https://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Win%20Builder/builds/42201
    
    e:\b\build\slave\gpu_win_builder\build\src\third_party\angle\src\libangle\renderer\d3d\d3d11\load_functions_table_autogen.cpp(787) : error C2440: 'return' : cannot convert from 'const std::map<GLenum,rx::LoadImageFunction,std::less<_Kty>,std::allocator<std::pair<const _Kty,_Ty>>>' to 'const std::map<GLenum,rx::d3d11::LoadImageFunctionInfo,std::less<_Kty>,std::allocator<std::pair<const _Kty,_Ty>>> &'
            with
            [
                _Kty=GLuint
    ,            _Ty=rx::LoadImageFunction
            ]
            and
            [
                _Kty=GLuint
    ,            _Ty=rx::d3d11::LoadImageFunctionInfo
            ]
            Reason: cannot convert from 'const std::map<GLenum,rx::LoadImageFunction,std::less<_Kty>,std::allocator<std::pair<const _Kty,_Ty>>>' to 'const std::map<GLenum,rx::d3d11::LoadImageFunctionInfo,std::less<_Kty>,std::allocator<std::pair<const _Kty,_Ty>>>'
            with
            [
                _Kty=GLuint
    ,            _Ty=rx::LoadImageFunction
            ]
            and
            [
                _Kty=GLuint
    ,            _Ty=rx::d3d11::LoadImageFunctionInfo
            ]
            No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called
    
    This reverts commit 52d3e43b.
    
    Change-Id: I83774ea09ccbb2b92ff609714e1c7201beb775bc
    Reviewed-on: https://chromium-review.googlesource.com/326540Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
    3a913264
TextureStorage11.cpp 105 KB
EditWeb IDE
×

Replace TextureStorage11.cpp

Attach a file by drag & drop or click to upload


Cancel
A new branch will be created in your fork and a new merge request will be started.