From 764f36247d3fc12d1b1bf5254de9d38bf5e69a50 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sun, 8 Feb 2009 08:01:38 +0000 Subject: [PATCH] Mesa 7.3 --- .cvsignore | 6 +- import.log | 1 + intel-fix-sarea-define.patch | 22 ------ intel-triple-remove.patch | 136 ----------------------------------- mesa.spec | 16 +++-- sources | 6 +- 6 files changed, 16 insertions(+), 171 deletions(-) delete mode 100644 intel-fix-sarea-define.patch delete mode 100644 intel-triple-remove.patch diff --git a/.cvsignore b/.cvsignore index 58fbdc5..f518248 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -xdriinfo-1.0.2.tar.bz2 gl-manpages-1.0.1.tar.bz2 -MesaLib-7.3-rc3.tar.gz -MesaDemos-7.3-rc3.tar.gz +xdriinfo-1.0.2.tar.bz2 +MesaDemos-7.3.tar.bz2 +MesaLib-7.3.tar.bz2 diff --git a/import.log b/import.log index 1c8753e..db7b749 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005 +mesa-7_3-1_fc11:HEAD:mesa-7.3-1.fc11.src.rpm:1234080261 diff --git a/intel-fix-sarea-define.patch b/intel-fix-sarea-define.patch deleted file mode 100644 index 513ddeb..0000000 --- a/intel-fix-sarea-define.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up mesa-20081220/src/mesa/drivers/dri/intel/intel_context.h.dave mesa-20081220/src/mesa/drivers/dri/intel/intel_context.h ---- mesa-20081220/src/mesa/drivers/dri/intel/intel_context.h.dave 2008-12-21 08:46:51.000000000 +1000 -+++ mesa-20081220/src/mesa/drivers/dri/intel/intel_context.h 2008-12-21 08:47:04.000000000 +1000 -@@ -268,6 +268,7 @@ struct intel_context - __DRIdrawablePrivate *driReadDrawable; - __DRIscreenPrivate *driScreen; - intelScreenPrivate *intelScreen; -+#define drm_i915_sarea _drm_i915_sarea - volatile struct drm_i915_sarea *sarea; - - GLuint lastStamp; -diff -up mesa-20081220/src/mesa/drivers/dri/intel/intel_screen.h.dave mesa-20081220/src/mesa/drivers/dri/intel/intel_screen.h ---- mesa-20081220/src/mesa/drivers/dri/intel/intel_screen.h.dave 2008-12-21 09:09:05.000000000 +1000 -+++ mesa-20081220/src/mesa/drivers/dri/intel/intel_screen.h 2008-12-21 09:08:35.000000000 +1000 -@@ -68,6 +68,7 @@ typedef struct - - __DRIscreenPrivate *driScrnPriv; - -+#define drm_i915_sarea _drm_i915_sarea - volatile struct drm_i915_sarea *sarea; - - int drmMinor; diff --git a/intel-triple-remove.patch b/intel-triple-remove.patch deleted file mode 100644 index 42b7d0a..0000000 --- a/intel-triple-remove.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c -index f8f009c..4d036de 100644 ---- a/src/mesa/drivers/dri/intel/intel_buffers.c -+++ b/src/mesa/drivers/dri/intel/intel_buffers.c -@@ -181,7 +181,7 @@ intelUpdatePageFlipping(struct intel_context *intel, - intel_fb->pf_current_page = (intel->sarea->pf_current_page >> - (intel_fb->pf_planes & 0x2)) & 0x3; - -- intel_fb->pf_num_pages = intel->intelScreen->third.handle ? 3 : 2; -+ intel_fb->pf_num_pages = 2; - - pf_active = pf_planes && (pf_planes & intel->sarea->pf_active) == pf_planes; - -diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c -index 6c625b4..6ff98e9 100644 ---- a/src/mesa/drivers/dri/intel/intel_context.c -+++ b/src/mesa/drivers/dri/intel/intel_context.c -@@ -775,7 +775,6 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv) - - intel_region_release(&intel->front_region); - intel_region_release(&intel->back_region); -- intel_region_release(&intel->third_region); - intel_region_release(&intel->depth_region); - - driDestroyOptionCache(&intel->optionCache); -@@ -825,12 +824,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv, - intel_renderbuffer_set_region(intel_fb->color_rb[1], - intel->back_region); - } --#if 0 -- if (intel_fb->color_rb[2]) { -- intel_renderbuffer_set_region(intel_fb->color_rb[2], -- intel->third_region); -- } --#endif -+ - if (irbDepth) { - intel_renderbuffer_set_region(irbDepth, intel->depth_region); - } -@@ -867,7 +861,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv, - driDrawableInitVBlank(driDrawPriv); - intel_fb->vbl_waited = driDrawPriv->vblSeq; - -- for (i = 0; i < (intel->intelScreen->third.handle ? 3 : 2); i++) { -+ for (i = 0; i < 2; i++) { - if (intel_fb->color_rb[i]) - intel_fb->color_rb[i]->vbl_pending = driDrawPriv->vblSeq; - } -diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h -index ee43ed7..ac08117 100644 ---- a/src/mesa/drivers/dri/intel/intel_context.h -+++ b/src/mesa/drivers/dri/intel/intel_context.h -@@ -166,7 +166,6 @@ struct intel_context - - struct intel_region *front_region; - struct intel_region *back_region; -- struct intel_region *third_region; - struct intel_region *depth_region; - - /** -diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c -index 8dbcc30..51ce32a 100644 ---- a/src/mesa/drivers/dri/intel/intel_regions.c -+++ b/src/mesa/drivers/dri/intel/intel_regions.c -@@ -550,15 +550,6 @@ intel_recreate_static_regions(struct intel_context *intel) - intel->back_region, - &intelScreen->back); - --#ifdef I915 -- if (intelScreen->third.handle) { -- intel->third_region = -- intel_recreate_static(intel, "third", -- intel->third_region, -- &intelScreen->third); -- } --#endif /* I915 */ -- - /* Still assumes front.cpp == depth.cpp. We can kill this when we move to - * private buffers. - */ -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 61b55b9..fc4e82b 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -177,13 +177,6 @@ intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen, - intelScreen->back.size = sarea->back_size; - intelScreen->back.tiled = sarea->back_tiled; - -- if (intelScreen->driScrnPriv->ddx_version.minor >= 8) { -- intelScreen->third.offset = sarea->third_offset; -- intelScreen->third.handle = sarea->third_handle; -- intelScreen->third.size = sarea->third_size; -- intelScreen->third.tiled = sarea->third_tiled; -- } -- - intelScreen->depth.offset = sarea->depth_offset; - intelScreen->depth.handle = sarea->depth_handle; - intelScreen->depth.size = sarea->depth_size; -@@ -192,12 +185,10 @@ intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen, - if (intelScreen->driScrnPriv->ddx_version.minor >= 9) { - intelScreen->front.bo_handle = sarea->front_bo_handle; - intelScreen->back.bo_handle = sarea->back_bo_handle; -- intelScreen->third.bo_handle = sarea->third_bo_handle; - intelScreen->depth.bo_handle = sarea->depth_bo_handle; - } else { - intelScreen->front.bo_handle = -1; - intelScreen->back.bo_handle = -1; -- intelScreen->third.bo_handle = -1; - intelScreen->depth.bo_handle = -1; - } - -@@ -353,12 +344,6 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv, - _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT, - &intel_fb->color_rb[1]->Base); - -- if (screen->third.handle) { -- struct gl_renderbuffer *tmp_rb = NULL; -- -- intel_fb->color_rb[2] = intel_create_renderbuffer(rgbFormat); -- _mesa_reference_renderbuffer(&tmp_rb, &intel_fb->color_rb[2]->Base); -- } - } - - if (mesaVis->depthBits == 24) { -diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h -index 91f0d6d..cf5359b 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.h -+++ b/src/mesa/drivers/dri/intel/intel_screen.h -@@ -56,7 +56,6 @@ typedef struct - { - intelRegion front; - intelRegion back; -- intelRegion third; - intelRegion depth; - intelRegion tex; - diff --git a/mesa.spec b/mesa.spec index 3f9d8ed..2fa3c67 100644 --- a/mesa.spec +++ b/mesa.spec @@ -15,7 +15,7 @@ %define manpages gl-manpages-1.0.1 %define xdriinfo xdriinfo-1.0.2 %define gitdate 20081220 -#%define snapshot +#% define snapshot Summary: Mesa graphics libraries Name: mesa @@ -26,10 +26,12 @@ Group: System Environment/Libraries URL: http://www.mesa3d.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 -Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2 +Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2 +Source1: http://downloads.sf.net/mesa3d/MesaDemos-%{version}.tar.bz2 +#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 +#Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2 #Source0: %{name}-%{gitdate}.tar.bz2 -#Source2: %{manpages}.tar.bz2 +Source2: %{manpages}.tar.bz2 Source3: make-git-snapshot.sh Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 @@ -168,7 +170,7 @@ This package provides some demo applications for testing Mesa. %prep -%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1 +%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1 -b2 -b5 #%setup -q -n mesa-%{gitdate} -b2 -b5 %patch0 -p1 -b .osmesa %patch2 -p1 -b .intel-glthread @@ -421,8 +423,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/mesa-demos-data %changelog -* Thu Jan 22 2009 Kristian Høgsberg 7.3-1 -- And now, 7.3.0. +* Sun Feb 08 2009 Adam Jackson 7.3-1 +- Mesa 7.3 * Tue Jan 20 2009 Kristian Høgsberg 7.3-0.5 - Update to 7.3.0 rc3. diff --git a/sources b/sources index 5a3b4a6..fa81452 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -0623e9c84a355cc8c196fedb6ff5fc8c MesaLib-7.3-rc3.tar.gz -eb96f9833604f84d15a432ed7ae6723f MesaDemos-7.3-rc3.tar.gz +a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2 +3f0741394069bdf2329565a387396cda MesaDemos-7.3.tar.bz2 +781e7811a6ed5c97b2b8defefc8ffbc9 MesaLib-7.3.tar.bz2