mesa-demos: Changes to 'debian-unstable'

[Andreas Boll <aboll-guest@moszumanska.debian.org>]

 debian/changelog            |    9 +++++++++
 src/egl/opengles1/drawtex.c |   11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 614699817237d24ce52f01a60b35b46343edd0ab
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Wed Jul 2 19:30:38 2014 +0200

    Add changelog entry

diff --git a/debian/changelog b/debian/changelog
index 9a42da8..8311385 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa-demos (8.1.0-3) UNRELEASED; urgency=medium
+
+  * Cherry-pick commit 9c326a3 and 6ad8820 from upstream
+    (Closes: #753192).
+    - drawtex: resolve glDrawTexfOES extension function
+    - drawtex: fixed compiler warnings related to use of eglGetProcAddress
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com>  Wed, 02 Jul 2014 19:25:49 +0200
+
 mesa-demos (8.1.0-2) unstable; urgency=low
 
   [ Sven Joachim ]

commit db1ec4510b68e5bc857e82ed7ec1a63490f77113
Author: Stefan Dirsch <sndirsch@suse.de>
Date:   Thu May 8 11:48:44 2014 +0200

    drawtex: fixed compiler warnings related to use of eglGetProcAddress
    
    Add proper <EGL/egl.h> include and cast in order to fix compiler
    warnings related to the use of eglGetProcAddress.
    
    Reviewed-By: Tapani Pälli <tapani.palli@intel.com>

diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c
index 1ba8ac7..dc1de13 100644
--- a/src/egl/opengles1/drawtex.c
+++ b/src/egl/opengles1/drawtex.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <GLES/gl.h>
 #include <GLES/glext.h>
+#include <EGL/egl.h>
 
 #include "eglut.h"
 
@@ -129,7 +130,7 @@ init(void)
       exit(1);
    }
 
-   glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES");
+   glDrawTexfOES_func = (PFNGLDRAWTEXFOESPROC) eglGetProcAddress("glDrawTexfOES");
 
    if (!glDrawTexfOES_func) {
       fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n");

commit fa52d897632007864799c9ff9dadef66bc281e41
Author: Tapani Pälli <tapani.palli@intel.com>
Date:   Wed Apr 30 14:05:11 2014 +0300

    drawtex: resolve glDrawTexfOES extension function
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78101
    Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
    Reviewed-by: Brian Paul <brianp@vmware.com>
    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c
index 524f931..1ba8ac7 100644
--- a/src/egl/opengles1/drawtex.c
+++ b/src/egl/opengles1/drawtex.c
@@ -25,13 +25,14 @@ static GLfloat width = 200, height = 200;
 static GLboolean animate = GL_FALSE;
 static int win;
 
+static PFNGLDRAWTEXFOESPROC glDrawTexfOES_func = NULL;
 
 static void
 draw(void)
 {
    glClear(GL_COLOR_BUFFER_BIT);
 
-   glDrawTexfOES(view_posx, view_posy, 0.0, width, height);
+   glDrawTexfOES_func(view_posx, view_posy, 0.0, width, height);
 }
 
 
@@ -128,6 +129,13 @@ init(void)
       exit(1);
    }
 
+   glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES");
+
+   if (!glDrawTexfOES_func) {
+      fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n");
+      exit(1);
+   }
+
    glClearColor(0.4, 0.4, 0.4, 0.0);
 
    make_smile_texture();