From patchwork Tue Feb 8 11:10:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 88 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:39:52 -0000 Delivered-To: patches@linaro.org Received: by 10.147.124.5 with SMTP id b5cs87030yan; Tue, 8 Feb 2011 03:10:26 -0800 (PST) Received: by 10.227.11.143 with SMTP id t15mr8651443wbt.27.1297163425581; Tue, 08 Feb 2011 03:10:25 -0800 (PST) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id j7si8442311wbj.25.2011.02.08.03.10.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 08 Feb 2011 03:10:25 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of alexandros.frantzis@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of alexandros.frantzis@linaro.org) smtp.mail=alexandros.frantzis@linaro.org Received: by mail-wy0-f178.google.com with SMTP id 42so5651864wyb.37 for ; Tue, 08 Feb 2011 03:10:25 -0800 (PST) Received: by 10.227.167.8 with SMTP id o8mr4603524wby.166.1297163425068; Tue, 08 Feb 2011 03:10:25 -0800 (PST) Received: from localhost ([194.219.210.40]) by mx.google.com with ESMTPS id t5sm2757335wes.33.2011.02.08.03.10.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 08 Feb 2011 03:10:24 -0800 (PST) From: alexandros.frantzis@linaro.org To: cairo@cairographics.org Subject: [PATCH 3/6] gl: Replace ftransform() with manual coordinate calculation in shaders Date: Tue, 8 Feb 2011 13:10:12 +0200 Message-Id: <1297163415-31035-4-git-send-email-alexandros.frantzis@linaro.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297163415-31035-1-git-send-email-alexandros.frantzis@linaro.org> References: <1297163415-31035-1-git-send-email-alexandros.frantzis@linaro.org> From: Alexandros Frantzis The ftransform() shader function was deprecated and removed in recent GLSL versions and is not included at all in GLSL ES. --- src/cairo-gl-shaders.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c index 1b10b04..13efccb 100644 --- a/src/cairo-gl-shaders.c +++ b/src/cairo-gl-shaders.c @@ -520,7 +520,7 @@ cairo_gl_shader_get_vertex_source (cairo_gl_var_type_t src, _cairo_output_stream_printf (stream, "void main()\n" "{\n" - " gl_Position = ftransform();\n"); + " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"); cairo_gl_shader_emit_vertex (stream, src, CAIRO_GL_TEX_SOURCE); cairo_gl_shader_emit_vertex (stream, mask, CAIRO_GL_TEX_MASK);