Edit

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

Branch :

  • Show log

    Commit

  • Author : Austin Kinross
    Date : 2015-01-30 13:06:52
    Hash : 31018486
    Message : Resubmit "Compile the D3D11 VS and PS on separate threads at GL link time" The original change caused a Chromium build break due to "__uncaught_exception" not being defined in concrt.h. This is because Chromium defines "_HAS_EXCEPTIONS=0" in its GYP, but ANGLE doesn't do this. This change defines "_HAS_EXCEPTIONS=0" in ANGLE's GYP to match Chromium, and refines it in ProgramD3D.cpp before including <future>. Change-Id: Ic324702569bac8f4ae1381f308c4f3f11f190f9e Reviewed-on: https://chromium-review.googlesource.com/244860 Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

  • src/libANGLE/Error.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.
    //
    
    // Error.cpp: Implements the egl::Error and gl::Error classes which encapsulate API errors
    // and optional error messages.
    
    #include "libANGLE/Error.h"
    
    #include "common/angleutils.h"
    
    #include <cstdarg>
    
    namespace gl
    {
    
    Error::Error(GLenum errorCode)
        : mCode(errorCode),
          mMessage(NULL)
    {
    }
    
    Error::Error(GLenum errorCode, const char *msg, ...)
        : mCode(errorCode),
          mMessage(NULL)
    {
        va_list vararg;
        va_start(vararg, msg);
        createMessageString();
    
        // gl::Errors can be created across multiple threads, so we must make sure they're thread safe.
        *mMessage = FormatString(msg, vararg);
        va_end(vararg);
    }
    
    Error::Error(const Error &other)
        : mCode(other.mCode),
          mMessage(NULL)
    {
        if (other.mMessage != NULL)
        {
            createMessageString();
            *mMessage = *(other.mMessage);
        }
    }
    
    Error::~Error()
    {
        SafeDelete(mMessage);
    }
    
    Error &Error::operator=(const Error &other)
    {
        mCode = other.mCode;
    
        if (other.mMessage != NULL)
        {
            createMessageString();
            *mMessage = *(other.mMessage);
        }
        else
        {
            SafeDelete(mMessage);
        }
    
        return *this;
    }
    
    void Error::createMessageString() const
    {
        if (mMessage == nullptr)
        {
            mMessage = new std::string();
        }
    }
    
    const std::string &Error::getMessage() const
    {
        createMessageString();
        return *mMessage;
    }
    
    }
    
    namespace egl
    {
    
    Error::Error(EGLint errorCode)
        : mCode(errorCode),
          mMessage(NULL)
    {
    }
    
    Error::Error(EGLint errorCode, const char *msg, ...)
        : mCode(errorCode),
          mMessage(NULL)
    {
        va_list vararg;
        va_start(vararg, msg);
        createMessageString();
        *mMessage = FormatString(msg, vararg);
        va_end(vararg);
    }
    
    Error::Error(const Error &other)
        : mCode(other.mCode),
          mMessage(NULL)
    {
        if (other.mMessage != NULL)
        {
            createMessageString();
            *mMessage = *(other.mMessage);
        }
    }
    
    Error::~Error()
    {
        SafeDelete(mMessage);
    }
    
    Error &Error::operator=(const Error &other)
    {
        mCode = other.mCode;
    
        if (other.mMessage != NULL)
        {
            createMessageString();
            *mMessage = *(other.mMessage);
        }
        else
        {
            SafeDelete(mMessage);
        }
    
        return *this;
    }
    
    void Error::createMessageString() const
    {
        if (mMessage == nullptr)
        {
            mMessage = new std::string();
        }
    }
    
    const std::string &Error::getMessage() const
    {
        createMessageString();
        return *mMessage;
    }
    
    }