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/659219
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/common/string_utils.cpp b/src/common/string_utils.cpp
index bb1edd2..67ca3c6 100644
--- a/src/common/string_utils.cpp
+++ b/src/common/string_utils.cpp
@@ -179,4 +179,12 @@
return memcmp(end, suffix, len) == 0;
}
+void ToLower(std::string *str)
+{
+ for (auto &ch : *str)
+ {
+ ch = static_cast<char>(::tolower(ch));
+ }
+}
+
} // namespace angle
diff --git a/src/common/string_utils.h b/src/common/string_utils.h
index c649c64..83e01ea 100644
--- a/src/common/string_utils.h
+++ b/src/common/string_utils.h
@@ -62,6 +62,9 @@
// Suffix may not be NUL and needs to be NULL terminated.
// The comparison is case sensitive.
bool EndsWith(const std::string& str, const char* suffix);
+
+// Convert to lower-case.
+void ToLower(std::string *str);
}
#endif // LIBANGLE_STRING_UTILS_H_
diff --git a/src/tests/gl_tests/ProgramBinaryTest.cpp b/src/tests/gl_tests/ProgramBinaryTest.cpp
index 9ab10ff..6ee5eb3 100644
--- a/src/tests/gl_tests/ProgramBinaryTest.cpp
+++ b/src/tests/gl_tests/ProgramBinaryTest.cpp
@@ -11,6 +11,7 @@
#include "EGLWindow.h"
#include "OSWindow.h"
+#include "common/string_utils.h"
#include "test_utils/angle_test_configs.h"
#include "test_utils/gl_raii.h"
@@ -761,7 +762,7 @@
secondRenderer.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE)
{
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 softwareAdapterPos = rendererString.find(std::string("software adapter"));
diff --git a/src/tests/gl_tests/RendererTest.cpp b/src/tests/gl_tests/RendererTest.cpp
index 20be05f..310beb5 100644
--- a/src/tests/gl_tests/RendererTest.cpp
+++ b/src/tests/gl_tests/RendererTest.cpp
@@ -10,6 +10,8 @@
#include "test_utils/ANGLETest.h"
+#include "common/string_utils.h"
+
using namespace angle;
namespace
@@ -28,10 +30,10 @@
TEST_P(RendererTest, RequestedRendererCreated)
{
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::transform(versionString.begin(), versionString.end(), versionString.begin(), ::tolower);
+ angle::ToLower(&versionString);
const EGLPlatformParameters &platform = GetParam().eglParameters;
diff --git a/src/vulkan_support/vulkan.gypi b/src/vulkan_support/vulkan.gypi
index 57d77a3..58522e1 100644
--- a/src/vulkan_support/vulkan.gypi
+++ b/src/vulkan_support/vulkan.gypi
@@ -355,6 +355,7 @@
'AdditionalOptions':
[
'/wd4100', # Unreferenced formal parameter
+ '/wd4244', # Conversion from 'int' to 'char', possible loss of data
'/wd4456', # Declaration hides previous local declaration
'/wd4457', # Declaration hides function parameter
'/wd4458', # Declaration hides class member