Edit

kc3-lang/angle/src/libANGLE/AttributeMap.cpp

Branch :

  • Show log

    Commit

  • Author : Olli Etuaho
    Date : 2016-06-07 13:10:50
    Hash : 46d7932a
    Message : Fix MSVS x64 build EGLAttrib can be a 64-bit type on some configurations, in which case it needs an explicit cast to be converted to EGLint. TEST=standalone MSVS 2015 x64 debug build Change-Id: I6b3e0ae705e8862e079e81e516d6bf99409732e7 Reviewed-on: https://chromium-review.googlesource.com/350411 Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

  • src/libANGLE/AttributeMap.cpp
  • //
    // Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
    // Use of this source code is governed by a BSD-style license that can be
    // found in the LICENSE file.
    //
    
    #include "libANGLE/AttributeMap.h"
    
    namespace egl
    {
    
    AttributeMap::AttributeMap()
    {
    }
    
    void AttributeMap::insert(EGLAttrib key, EGLAttrib value)
    {
        mAttributes[key] = value;
    }
    
    bool AttributeMap::contains(EGLAttrib key) const
    {
        return (mAttributes.find(key) != mAttributes.end());
    }
    
    EGLAttrib AttributeMap::get(EGLAttrib key, EGLAttrib defaultValue) const
    {
        std::map<EGLAttrib, EGLAttrib>::const_iterator iter = mAttributes.find(key);
        return (mAttributes.find(key) != mAttributes.end()) ? iter->second : defaultValue;
    }
    
    EGLint AttributeMap::getAsInt(EGLAttrib key, EGLint defaultValue) const
    {
        return static_cast<EGLint>(
            get(static_cast<EGLAttrib>(key), static_cast<EGLAttrib>(defaultValue)));
    }
    
    bool AttributeMap::isEmpty() const
    {
        return mAttributes.empty();
    }
    
    std::vector<EGLint> AttributeMap::toIntVector() const
    {
        std::vector<EGLint> ret;
        for (const auto &pair : mAttributes)
        {
            ret.push_back(static_cast<EGLint>(pair.first));
            ret.push_back(static_cast<EGLint>(pair.second));
        }
        ret.push_back(EGL_NONE);
    
        return ret;
    }
    
    AttributeMap::const_iterator AttributeMap::begin() const
    {
        return mAttributes.begin();
    }
    
    AttributeMap::const_iterator AttributeMap::end() const
    {
        return mAttributes.end();
    }
    
    // static
    AttributeMap AttributeMap::CreateFromIntArray(const EGLint *attributes)
    {
        AttributeMap map;
        if (attributes)
        {
            for (const EGLint *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib += 2)
            {
                map.insert(static_cast<EGLAttrib>(curAttrib[0]), static_cast<EGLAttrib>(curAttrib[1]));
            }
        }
        return map;
    }
    
    // static
    AttributeMap AttributeMap::CreateFromAttribArray(const EGLAttrib *attributes)
    {
        AttributeMap map;
        if (attributes)
        {
            for (const EGLAttrib *curAttrib = attributes; curAttrib[0] != EGL_NONE; curAttrib += 2)
            {
                map.insert(curAttrib[0], curAttrib[1]);
            }
        }
        return map;
    }
    }