Commit ef97c613 by Jamie Madill Committed by Commit Bot

Roll GYP for VS2017 project support.

Also includes a ToLower string helper for a VS2017 warning fix. https://chromium.googlesource.com/external/gyp.git/+log/aae1e3efb50786df2..c6f471687407bf28d BUG=angleproject:1569 Change-Id: Iaf8a091a24d937db3adb242f05c8a5c9d2b03b0f Reviewed-on: https://chromium-review.googlesource.com/659219Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 1aa66bc7
...@@ -25,7 +25,7 @@ deps = { ...@@ -25,7 +25,7 @@ deps = {
Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb', Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb',
'third_party/gyp': 'third_party/gyp':
Var('chromium_git') + '/external/gyp' + '@' + 'aae1e3efb50786df20e9572621fb746865f0df53', Var('chromium_git') + '/external/gyp' + '@' + 'c6f471687407bf28ddfc63f1a8f47aeb7bf54edc',
'third_party/libpng': 'third_party/libpng':
Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c', Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',
......
...@@ -179,4 +179,12 @@ bool EndsWith(const std::string &str, const char *suffix) ...@@ -179,4 +179,12 @@ bool EndsWith(const std::string &str, const char *suffix)
return memcmp(end, suffix, len) == 0; return memcmp(end, suffix, len) == 0;
} }
void ToLower(std::string *str)
{
for (auto &ch : *str)
{
ch = static_cast<char>(::tolower(ch));
}
}
} // namespace angle } // namespace angle
...@@ -62,6 +62,9 @@ bool BeginsWith(const char *str, const char *prefix); ...@@ -62,6 +62,9 @@ bool BeginsWith(const char *str, const char *prefix);
// Suffix may not be NUL and needs to be NULL terminated. // Suffix may not be NUL and needs to be NULL terminated.
// The comparison is case sensitive. // The comparison is case sensitive.
bool EndsWith(const std::string& str, const char* suffix); bool EndsWith(const std::string& str, const char* suffix);
// Convert to lower-case.
void ToLower(std::string *str);
} }
#endif // LIBANGLE_STRING_UTILS_H_ #endif // LIBANGLE_STRING_UTILS_H_
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "EGLWindow.h" #include "EGLWindow.h"
#include "OSWindow.h" #include "OSWindow.h"
#include "common/string_utils.h"
#include "test_utils/angle_test_configs.h" #include "test_utils/angle_test_configs.h"
#include "test_utils/gl_raii.h" #include "test_utils/gl_raii.h"
...@@ -761,7 +762,7 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary) ...@@ -761,7 +762,7 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary)
secondRenderer.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE) secondRenderer.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE)
{ {
std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER))); std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
std::transform(rendererString.begin(), rendererString.end(), rendererString.begin(), ::tolower); angle::ToLower(&rendererString);
auto basicRenderPos = rendererString.find(std::string("microsoft basic render")); auto basicRenderPos = rendererString.find(std::string("microsoft basic render"));
auto softwareAdapterPos = rendererString.find(std::string("software adapter")); auto softwareAdapterPos = rendererString.find(std::string("software adapter"));
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "test_utils/ANGLETest.h" #include "test_utils/ANGLETest.h"
#include "common/string_utils.h"
using namespace angle; using namespace angle;
namespace namespace
...@@ -28,10 +30,10 @@ class RendererTest : public ANGLETest ...@@ -28,10 +30,10 @@ class RendererTest : public ANGLETest
TEST_P(RendererTest, RequestedRendererCreated) TEST_P(RendererTest, RequestedRendererCreated)
{ {
std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER))); std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
std::transform(rendererString.begin(), rendererString.end(), rendererString.begin(), ::tolower); angle::ToLower(&rendererString);
std::string versionString = std::string(reinterpret_cast<const char*>(glGetString(GL_VERSION))); std::string versionString = std::string(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
std::transform(versionString.begin(), versionString.end(), versionString.begin(), ::tolower); angle::ToLower(&versionString);
const EGLPlatformParameters &platform = GetParam().eglParameters; const EGLPlatformParameters &platform = GetParam().eglParameters;
......
...@@ -355,6 +355,7 @@ ...@@ -355,6 +355,7 @@
'AdditionalOptions': 'AdditionalOptions':
[ [
'/wd4100', # Unreferenced formal parameter '/wd4100', # Unreferenced formal parameter
'/wd4244', # Conversion from 'int' to 'char', possible loss of data
'/wd4456', # Declaration hides previous local declaration '/wd4456', # Declaration hides previous local declaration
'/wd4457', # Declaration hides function parameter '/wd4457', # Declaration hides function parameter
'/wd4458', # Declaration hides class member '/wd4458', # Declaration hides class member
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment