summarylogtreecommitdiffstats
path: root/0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch
diff options
context:
space:
mode:
authorAaron Plattner2016-06-06 15:40:33 -0700
committerAaron Plattner2016-06-06 15:43:38 -0700
commit527fba43a5628b8e2697ff253b162622e321b201 (patch)
tree38308204f797794fc0b30eb229b70550f340929b /0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch
parent57673850b273dcf3db6c85abe9bc1d45d090eaf4 (diff)
downloadaur-527fba43a5628b8e2697ff253b162622e321b201.tar.gz
Update to Weston 1.11.0
Fetched patches from the nvidia_r364 branch of git://people.freedesktop.org/~jjones/weston and then rebased on top of the 1.11.0 tag. Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Diffstat (limited to '0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch')
-rw-r--r--0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch b/0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch
new file mode 100644
index 000000000000..8af11b537299
--- /dev/null
+++ b/0005-gl-renderer-Accept-non-NULL-empty-visual_id-arrays.patch
@@ -0,0 +1,32 @@
+From d55b51e9bdd451c0ff635d8937e1e818a6de1216 Mon Sep 17 00:00:00 2001
+From: "Miguel A. Vico" <mvicomoya@nvidia.com>
+Date: Wed, 30 Mar 2016 15:29:37 +0200
+Subject: [PATCH 05/11] gl-renderer: Accept non-NULL empty <visual_id> arrays
+X-NVConfidentiality: public
+
+This change modifies egl_choose_config() to accept a non-NULL but empty
+<visual_id> array (i.e. n_ids == 0)
+
+Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
+Reviewed-by: Andy Ritger <aritger@nvidia.com>
+Reviewed-by: James Jones <jajones@nvidia.com>
+---
+ src/gl-renderer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gl-renderer.c b/src/gl-renderer.c
+index 7f522055fac8..1d76488c2165 100644
+--- a/src/gl-renderer.c
++++ b/src/gl-renderer.c
+@@ -2493,7 +2493,7 @@ egl_choose_config(struct gl_renderer *gr, const EGLint *attribs,
+ goto out;
+ }
+
+- if (!visual_id)
++ if (!visual_id || n_ids == 0)
+ config_index = 0;
+
+ for (i = 0; config_index == -1 && i < n_ids; i++)
+--
+2.8.3
+