summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-01-06 23:45:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:23:16 +0000
commit48b0bc85502e394f13898bbec61e21f9282b0edf (patch)
tree1e4a69b2990105f2ee75a5527e7bd85d5053d084
parent123ca1c3457e472bd3dab5563f7ba5312a9864bf (diff)
downloadopenembedded-core-contrib-48b0bc85502e394f13898bbec61e21f9282b0edf.tar.gz
openembedded-core-contrib-48b0bc85502e394f13898bbec61e21f9282b0edf.tar.bz2
openembedded-core-contrib-48b0bc85502e394f13898bbec61e21f9282b0edf.zip
cogl-1.0: fix may be used uninitialized error
Fixed when DEBUG_BUILD = "1": test-backface-culling.c:206:7: error: 'cull_front' may be used uninitialized in this function [-Werror=maybe-uninitialized] | validate_part (framebuffer, | ^ | cc1: some warnings being treated as errors Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch35
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb2
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch b/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch
new file mode 100644
index 0000000000..479a0ff4b5
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch
@@ -0,0 +1,35 @@
+From a51f61d675a0e7d6649182c6a1325ceab8342df2 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Mon, 4 Jan 2016 22:47:29 -0800
+Subject: [PATCH] test-backface-culling.c: fix may be used uninitialized error
+
+Fixed when gcc -O:
+test-backface-culling.c:206:7: error: 'cull_front' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+| validate_part (framebuffer,
+| ^
+| cc1: some warnings being treated as errors
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ tests/conform/test-backface-culling.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c
+index e90c2f5..7c45592 100644
+--- a/tests/conform/test-backface-culling.c
++++ b/tests/conform/test-backface-culling.c
+@@ -164,7 +164,8 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset)
+
+ for (draw_num = 0; draw_num < 16; draw_num++)
+ {
+- CoglBool cull_front, cull_back;
++ CoglBool cull_front = FALSE;
++ CoglBool cull_back = FALSE;
+ CoglPipelineCullFaceMode cull_mode;
+
+ if (USE_LEGACY_STATE (draw_num))
+--
+1.7.9.5
+
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
index 3b1e1994e0..ed10c7a39f 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
@@ -1,5 +1,7 @@
require cogl-1.0.inc
+SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch"
+
LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8"
SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"