diff options
| author | Martchus | 2016-02-04 14:41:26 +0100 |
|---|---|---|
| committer | Martchus | 2016-02-04 14:41:26 +0100 |
| commit | bf80f35e3270de73508efe43ed801bdaa23b32fc (patch) | |
| tree | 7116841522d8289e4f32f85d06dc8b4cd8fe6042 /webkit-commit-142567.patch | |
| parent | 1a83c3d8763962187b9895c199b2c46aa4453c01 (diff) | |
| download | aur-bf80f35e3270de73508efe43ed801bdaa23b32fc.tar.gz | |
updated version (to 5.5.1), URL and description
Diffstat (limited to 'webkit-commit-142567.patch')
| -rw-r--r-- | webkit-commit-142567.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/webkit-commit-142567.patch b/webkit-commit-142567.patch new file mode 100644 index 000000000000..af8c3e8fac7a --- /dev/null +++ b/webkit-commit-142567.patch @@ -0,0 +1,57 @@ +Index: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
+===================================================================
+--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 136430)
++++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 142567)
+@@ -33,7 +33,14 @@
+ namespace WebCore {
+
+-inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
+-{
+- int value = -1;
++// Temporary typedef to support an incompatible change in the ANGLE API.
++#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
++typedef int ANGLEGetInfoType;
++#else
++typedef size_t ANGLEGetInfoType;
++#endif
++
++inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
++{
++ ANGLEGetInfoType value = 0;
+ ShGetInfo(compiler, shaderInfo, &value);
+ return value;
+@@ -56,13 +63,11 @@
+ }
+
+- int numSymbols = getValidationResultValue(compiler, symbolType);
+- if (numSymbols < 0)
+- return false;
+-
+- int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
++ ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType);
++
++ ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
+ if (maxNameLength <= 1)
+ return false;
+
+- int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
++ ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
+ if (maxMappedNameLength <= 1)
+ return false;
+@@ -72,7 +77,7 @@
+ Vector<char, 256> mappedNameBuffer(maxMappedNameLength);
+
+- for (int i = 0; i < numSymbols; ++i) {
++ for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {
+ ANGLEShaderSymbol symbol;
+- int nameLength = -1;
++ ANGLEGetInfoType nameLength = 0;
+ switch (symbolType) {
+ case SH_ACTIVE_ATTRIBUTES:
+@@ -88,5 +93,5 @@
+ return false;
+ }
+- if (nameLength <= 0)
++ if (!nameLength)
+ return false;
+
|