From patchwork Mon Mar 12 00:48:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 7210 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E71B523E00 for ; Mon, 12 Mar 2012 00:48:42 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9EB72A18384 for ; Mon, 12 Mar 2012 00:48:42 +0000 (UTC) Received: by iage36 with SMTP id e36so7826951iag.11 for ; Sun, 11 Mar 2012 17:48:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=fn5LGbyoYCJmYMNDJ2ST5ZdqPN3yXYE0tlXnG9EbCyY=; b=GeduCJNqUwx4RsaA1Br3yIRI2m0Bc6WrkSEw0BvgfmQLQQj/VYINWW7Fd1GzdHhGe8 gBd6oez/H7MyzsX0VqPutIhWkKzNfq48McLtOlvJY18PMx0Z/BJmzSHOvK8EhssURhcS AxWkhLOgZKJCjFSOndyjM9c3Fd6b9HBm4+W7dKsYXn1yckqMwshOReWkmxIEzr7vc0T2 gylFmCqSwiOx14m3+fGoeZHoxcygfsNIfoJVDjE8WfWYVB4S1yBR6AlsrCUUF71SxPZp UK0eAWHIaDQ40ABfSuKGAnxXIbSQnnFBcy2r+yrNm3zZn4NyMjJYxfnZhSMewDcDEAEp YGOA== Received: by 10.42.147.199 with SMTP id o7mr13214919icv.50.1331513322100; Sun, 11 Mar 2012 17:48:42 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp30737ibg; Sun, 11 Mar 2012 17:48:41 -0700 (PDT) Received: by 10.236.161.201 with SMTP id w49mr11095125yhk.76.1331513321190; Sun, 11 Mar 2012 17:48:41 -0700 (PDT) Received: from mail-gy0-f178.google.com (mail-gy0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id e42si12166536yhh.121.2012.03.11.17.48.40 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 17:48:41 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.160.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by ghbf1 with SMTP id f1so2464189ghb.37 for ; Sun, 11 Mar 2012 17:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=fn5LGbyoYCJmYMNDJ2ST5ZdqPN3yXYE0tlXnG9EbCyY=; b=hdxpnfDQVJARJju6QPzGVOtLtcql9gEk4WhiZXjQq7SyGj1TZhx8pArm4Ax579pJ2B 9OOAR0eSsMdM0dyD+Z0YcJcGgStzCexjxnqd6YQzE0TjTvkAir6tjpvapU0rqM3ugsj3 0t+nexViSDJi/Id1eOB5Mlrk+aBBoPShNOYiwWoE4a0W6AajB5fDL8SoZYVtMH5puutr /JlZZuVbMEBnb0Ag5MJkV4OVcsuRVP6+or6+OUuYuxhODBsjH/740+PE0Lou3aQ0lIHi MhxnBJVSswYf6VR0l8i9wYZcdUpFFBAlyqWCpS3n0JyTPB0jm3XwlcnZOlY+vtC6/PN1 vV4Q== Received: by 10.60.19.106 with SMTP id d10mr3442496oee.40.1331513320199; Sun, 11 Mar 2012 17:48:40 -0700 (PDT) Received: from localhost (ppp-70-129-134-19.dsl.rcsntx.swbell.net. [70.129.134.19]) by mx.google.com with ESMTPS id xh3sm15238685obb.13.2012.03.11.17.48.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 17:48:39 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: wayland-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH 1/5] clients/window: fix build issues w/ gles Date: Sun, 11 Mar 2012 19:48:41 -0500 Message-Id: <1331513325-1554-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQldc0nx8bDsk05/TlWCT8fzSwuD5meCByj2AnGl7//7FCUid5ogbmhSBiCoPdcF/SpIX8d6 From: Rob Clark --- clients/window.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/clients/window.c b/clients/window.c index b09de5b..5465c2d 100644 --- a/clients/window.c +++ b/clients/window.c @@ -41,7 +41,12 @@ #include +#ifdef USE_CAIRO_GLESV2 +#include +#include +#else #include +#endif #include #include @@ -2814,6 +2819,12 @@ init_egl(struct display *d) EGLint major, minor; EGLint n; +#ifdef USE_CAIRO_GLESV2 +# define GL_BIT EGL_OPENGL_ES2_BIT +#else +# define GL_BIT EGL_OPENGL_BIT +#endif + static const EGLint argb_cfg_attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PIXMAP_BIT, EGL_RED_SIZE, 1, @@ -2821,7 +2832,7 @@ init_egl(struct display *d) EGL_BLUE_SIZE, 1, EGL_ALPHA_SIZE, 1, EGL_DEPTH_SIZE, 1, - EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, + EGL_RENDERABLE_TYPE, GL_BIT, EGL_NONE };