[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/

[Mike Gilbert]

commit:     1cc6e650f4b09c32396fb33c6588dd2c09e53945
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Wed Jun 26 14:25:05 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 15:29:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc6e650

www-client/chromium: update angle inline patch

Closes: https://github.com/gentoo/gentoo/pull/12331
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../chromium/files/chromium-angle-inline.patch     | 120 ++++++++++++++++++---
 1 file changed, 106 insertions(+), 14 deletions(-)

diff --git a/www-client/chromium/files/chromium-angle-inline.patch b/www-client/chromium/files/chromium-angle-inline.patch
index 8ece410f104..e8975d74817 100644
--- a/www-client/chromium/files/chromium-angle-inline.patch
+++ b/www-client/chromium/files/chromium-angle-inline.patch
@@ -1,26 +1,118 @@
-From 2ee4e7f857514f4c0cbff135a1c5f968d8814d31 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@××××××××××.com>
-Date: Sun, 23 Jun 2019 12:14:57 +0000
-Subject: [PATCH] explicit declaration of const GLfloat/const GLint for ValidateSamplerParameterBase
+From 4c0a23611b3906855db7b93da2f34aec57930cdf Mon Sep 17 00:00:00 2001
+From: Geoff Lang <geofflang@××××××××.org>
+Date: Tue, 25 Jun 2019 10:56:29 -0400
+Subject: [PATCH] Update ValidateSamplerParameterBase to use const parameters.
 
+ValidateSamplerParameterBase is called with both const and non-const
+parameter pointers which caused our explicit template instantiations to
+not cover all cases resulting in link errors.  Force the parameters to
+always be const so that our instantiations cover everything.
+
+BUG=angleproject:3555
+
+Change-Id: Ibf92572ba80a689c75dcdc70e5153d9941da76f3
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1676305
+Reviewed-by: Jonah Ryan-Davis <jonahr@××××××.com>
+Commit-Queue: Geoff Lang <geofflang@××××××××.org>
 ---
- third_party/angle/src/libANGLE/validationES.cpp | 2 ++
- 1 file changed, 2 insertions(+)
 
 diff --git a/third_party/angle/src/libANGLE/validationES.cpp b/third_party/angle/src/libANGLE/validationES.cpp
-index ae353f7..fdc7ac2 100644
+index 041803a..3f402f6 100644
 --- a/third_party/angle/src/libANGLE/validationES.cpp
 +++ b/third_party/angle/src/libANGLE/validationES.cpp
-@@ -6089,7 +6089,9 @@ bool ValidateSamplerParameterBase(Context *context,
+@@ -189,7 +189,9 @@
+ }
+ 
+ template <typename ParamType>
+-bool ValidateTextureWrapModeValue(Context *context, ParamType *params, bool restrictedWrapModes)
++bool ValidateTextureWrapModeValue(Context *context,
++                                  const ParamType *params,
++                                  bool restrictedWrapModes)
+ {
+     switch (ConvertToGLenum(params[0]))
+     {
+@@ -223,7 +225,9 @@
+ }
+ 
+ template <typename ParamType>
+-bool ValidateTextureMinFilterValue(Context *context, ParamType *params, bool restrictedMinFilter)
++bool ValidateTextureMinFilterValue(Context *context,
++                                   const ParamType *params,
++                                   bool restrictedMinFilter)
+ {
+     switch (ConvertToGLenum(params[0]))
+     {
+@@ -252,7 +256,7 @@
+ }
+ 
+ template <typename ParamType>
+-bool ValidateTextureMagFilterValue(Context *context, ParamType *params)
++bool ValidateTextureMagFilterValue(Context *context, const ParamType *params)
+ {
+     switch (ConvertToGLenum(params[0]))
+     {
+@@ -269,7 +273,7 @@
  }
  
- template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
-+template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, const GLfloat *);
- template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
+ template <typename ParamType>
+-bool ValidateTextureCompareModeValue(Context *context, ParamType *params)
++bool ValidateTextureCompareModeValue(Context *context, const ParamType *params)
+ {
+     // Acceptable mode parameters from GLES 3.0.2 spec, table 3.17
+     switch (ConvertToGLenum(params[0]))
+@@ -287,7 +291,7 @@
+ }
+ 
+ template <typename ParamType>
+-bool ValidateTextureCompareFuncValue(Context *context, ParamType *params)
++bool ValidateTextureCompareFuncValue(Context *context, const ParamType *params)
+ {
+     // Acceptable function parameters from GLES 3.0.2 spec, table 3.17
+     switch (ConvertToGLenum(params[0]))
+@@ -311,7 +315,7 @@
+ }
+ 
+ template <typename ParamType>
+-bool ValidateTextureSRGBDecodeValue(Context *context, ParamType *params)
++bool ValidateTextureSRGBDecodeValue(Context *context, const ParamType *params)
+ {
+     if (!context->getExtensions().textureSRGBDecode)
+     {
+@@ -5996,7 +6000,7 @@
+                                   GLenum pname,
+                                   GLsizei bufSize,
+                                   bool vectorParams,
+-                                  ParamType *params)
++                                  const ParamType *params)
+ {
+     if (context->getClientMajorVersion() < 3)
+     {
+@@ -6099,8 +6103,13 @@
+     return true;
+ }
+ 
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
++template bool ValidateSamplerParameterBase(Context *,
++                                           GLuint,
++                                           GLenum,
++                                           GLsizei,
++                                           bool,
++                                           const GLfloat *);
 +template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, const GLint *);
  template bool ValidateSamplerParameterBase(Context *,
                                             GLuint,
                                             GLenum,
--- 
-2.21.0
-
+diff --git a/third_party/angle/src/libANGLE/validationES.h b/third_party/angle/src/libANGLE/validationES.h
+index c61bda6..4b06d28 100644
+--- a/third_party/angle/src/libANGLE/validationES.h
++++ b/third_party/angle/src/libANGLE/validationES.h
+@@ -584,7 +584,7 @@
+                                   GLenum pname,
+                                   GLsizei bufSize,
+                                   bool vectorParams,
+-                                  ParamType *params);
++                                  const ParamType *params);
+ 
+ bool ValidateGetInternalFormativBase(Context *context,
+                                      GLenum target,