The attached patches fix missing symbols in meta/st and a compilation
error in intel dri driver.

-- 
Regards,
olv
>From 0592716e6470b385eafea1f9520c5a0360f16e70 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <[email protected]>
Date: Mon, 21 Sep 2009 10:57:14 +0800
Subject: [PATCH 1/2] st/mesa: Compile in meta.c.

meta was moved to core Mesa since
651cffd626a82d9bf539437ca4bdf8ea4b396fab.

Signed-off-by: Chia-I Wu <[email protected]>
---
 src/mesa/sources.mak |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 7107538..c8d2f5a 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -333,6 +333,7 @@ MESA_GALLIUM_SOURCES = \
 	$(VBO_SOURCES)		\
 	$(STATETRACKER_SOURCES)	\
 	$(SHADER_SOURCES)	\
+	drivers/common/meta.c	\
 	ppc/common_ppc.c	\
 	x86/common_x86.c	\
 	$(SLANG_SOURCES)
-- 
1.6.2.4

>From 24378dfca0c5287b0fc426e9a841fbdeaf10bbeb Mon Sep 17 00:00:00 2001
From: Chia-I Wu <[email protected]>
Date: Mon, 21 Sep 2009 10:52:07 +0800
Subject: [PATCH 2/2] intel: meta clear has a new name.

It was renamed to _mesa_meta_Clear.

Signed-off-by: Chia-I Wu <[email protected]>
---
 src/mesa/drivers/dri/intel/intel_clear.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_clear.c b/src/mesa/drivers/dri/intel/intel_clear.c
index 9010b91..fef977f 100644
--- a/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@ -172,7 +172,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
 	 DBG("\n");
       }
 
-      _mesa_meta_clear(&intel->ctx, tri_mask);
+      _mesa_meta_Clear(&intel->ctx, tri_mask);
       intel_batchbuffer_flush(intel->batch);
    }
 
-- 
1.6.2.4

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Reply via email to