Edit

kc3-lang/angle/src/common/angleutils.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/common/angleutils.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 "common/angleutils.h"
    #include "common/debug.h"
    
    #include <stdio.h>
    #include <vector>
    
    size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& outBuffer)
    {
        // Attempt to just print to the current buffer
        int len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg);
        if (len < 0 || static_cast<size_t>(len) >= outBuffer.size())
        {
            // Buffer was not large enough, calculate the required size and resize the buffer
            len = vsnprintf(NULL, 0, fmt, vararg);
            outBuffer.resize(len + 1);
    
            // Print again
            len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg);
        }
        ASSERT(len >= 0);
        return static_cast<size_t>(len);
    }
    
    std::string FormatString(const char *fmt, va_list vararg)
    {
        // Note: this needs to be thread-safe, since the D3D11 renderer uses some multithreading
        std::vector<char> buffer(512);
    
        size_t len = FormatStringIntoVector(fmt, vararg, buffer);
        return std::string(&buffer[0], len);
    }
    
    std::string FormatString(const char *fmt, ...)
    {
        va_list vararg;
        va_start(vararg, fmt);
        std::string result = FormatString(fmt, vararg);
        va_end(vararg);
        return result;
    }