rpms
/
mesa
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- latest snapshot - r300 bufmgr code 

- stop building mach64, patch around some intel issues
This commit is contained in:
Dave Airlie 2008-09-05 05:48:02 +00:00
parent 336da42a01
commit 7cf755a92d
9 changed files with 780 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
gl-manpages-1.0.1.tar.bz2
mesa-20080814.tar.bz2
mesa-20080905.tar.bz2

57
intel-mmio-fix.patch Normal file
View File

@ -0,0 +1,57 @@
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index c2ad5a0..18e7348 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -409,10 +409,12 @@ static const struct dri_extension brw_extensions[] = {
{ NULL, NULL }
};
+#ifdef I915_MMIO_READ
static const struct dri_extension arb_oc_extensions[] = {
{"GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions},
{NULL, NULL}
};
+#endif
static const struct dri_extension ttm_extensions[] = {
{"GL_EXT_framebuffer_object", GL_EXT_framebuffer_object_functions},
@@ -437,10 +439,12 @@ void intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging)
if (intel == NULL || intel->ttm)
driInitExtensions(ctx, ttm_extensions, GL_FALSE);
+#ifdef I915_MMIO_READ
if (intel == NULL ||
(IS_965(intel->intelScreen->deviceID) &&
intel->intelScreen->drmMinor >= 8))
driInitExtensions(ctx, arb_oc_extensions, GL_FALSE);
+#endif
if (intel == NULL || IS_965(intel->intelScreen->deviceID))
driInitExtensions(ctx, brw_extensions, GL_FALSE);
@@ -538,6 +542,7 @@ intelFinish(GLcontext * ctx)
}
}
+#ifdef I915_MMIO_READ
static void
intelBeginQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
{
@@ -568,6 +573,7 @@ intelEndQuery(GLcontext *ctx, GLenum target, struct gl_query_object *q)
q->Ready = GL_TRUE;
intel->stats_wm--;
}
+#endif
/** Driver-specific fence emit implementation for the fake memory manager. */
static unsigned int
@@ -684,8 +690,10 @@ intelInitDriverFunctions(struct dd_function_table *functions)
functions->CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
functions->CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+#ifdef I915_MMIO_READ
functions->BeginQuery = intelBeginQuery;
functions->EndQuery = intelEndQuery;
+#endif
intelInitTextureFuncs(functions);
intelInitStateFuncs(functions);

13
mesa-7.1pre-nukeglthread-debug.patch → mesa-7.1-nukeglthread-debug.patch
View File

@ -1,9 +1,8 @@
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 94d499f..2ba596e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -615,11 +615,6 @@ intel_render_texture(GLcontext * ctx,
}
diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
--- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread 2008-08-25 10:49:40.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c 2008-08-28 14:26:17.000000000 -0400
@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
return;
}
- DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
@ -14,7 +13,7 @@ index 94d499f..2ba596e 100644
/* point the renderbufer's region to the texture image region */
intel_image = intel_texture_image(newImage);
if (irb->region != intel_image->mt->region) {
@@ -656,8 +651,6 @@ intel_finish_render_texture(GLcontext * ctx,
@@ -674,8 +669,6 @@ intel_finish_render_texture(GLcontext *
{
struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);

6
mesa-7.1pre-osmesa-version.patch → mesa-7.1-osmesa-version.patch
View File

@ -1,6 +1,6 @@
diff -up mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080814/src/mesa/drivers/osmesa/Makefile
--- mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa 2008-08-28 22:33:46.000000000 +1000
+++ mesa-20080814/src/mesa/drivers/osmesa/Makefile 2008-08-28 22:34:06.000000000 +1000
diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
--- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx 2008-08-28 14:05:47.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile 2008-08-28 14:07:13.000000000 -0400
@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)

48
mesa-fixes.patch
View File

@ -1,48 +0,0 @@
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 91b835d..ddfdce3 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -455,8 +455,7 @@ static struct intel_region *
intel_recreate_static(struct intel_context *intel,
const char *name,
struct intel_region *region,
- intelRegion *region_desc,
- GLuint mem_type)
+ intelRegion *region_desc)
{
intelScreenPrivate *intelScreen = intel->intelScreen;
int ret;
@@ -537,22 +536,19 @@ intel_recreate_static_regions(struct intel_context *intel)
intel->front_region =
intel_recreate_static(intel, "front",
intel->front_region,
- &intelScreen->front,
- DRM_BO_FLAG_MEM_TT);
+ &intelScreen->front);
intel->back_region =
intel_recreate_static(intel, "back",
intel->back_region,
- &intelScreen->back,
- DRM_BO_FLAG_MEM_TT);
+ &intelScreen->back);
#ifdef I915
if (intelScreen->third.handle) {
intel->third_region =
intel_recreate_static(intel, "third",
intel->third_region,
- &intelScreen->third,
- DRM_BO_FLAG_MEM_TT);
+ &intelScreen->third);
}
#endif /* I915 */
@@ -562,6 +558,5 @@ intel_recreate_static_regions(struct intel_context *intel)
intel->depth_region =
intel_recreate_static(intel, "depth",
intel->depth_region,
- &intelScreen->depth,
- DRM_BO_FLAG_MEM_TT);
+ &intelScreen->depth);
}

45
mesa-no-mach64.patch Normal file
View File

@ -0,0 +1,45 @@
--- configure.ac.mach64 2008-09-05 13:53:24.000000000 +1000
+++ configure.ac 2008-09-05 13:53:39.000000000 +1000
@@ -656,7 +656,7 @@
# because there is no x86-64 system where they could *ever*
# be used.
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
+ DRI_DIRS="i915 i965 mga r128 r200 r300 radeon \
savage tdfx unichrome swrast"
fi
;;
@@ -664,13 +664,13 @@
# Build only the drivers for cards that exist on PowerPC.
# At some point MGA will be added, but not yet.
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="mach64 r128 r200 r300 radeon tdfx swrast"
+ DRI_DIRS="r128 r200 r300 radeon tdfx swrast"
fi
;;
sparc*)
# Build only the drivers for cards that exist on sparc`
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="mach64 r128 r200 r300 radeon ffb swrast"
+ DRI_DIRS="r128 r200 r300 radeon ffb swrast"
fi
;;
esac
@@ -689,7 +689,7 @@
# ffb and gamma are missing because they have not been converted
# to use the new interface.
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon tdfx \
unichrome savage sis swrast"
fi
;;
@@ -704,7 +704,7 @@
# default drivers
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome ffb swrast"
fi

29
mesa.spec
View File

@ -12,12 +12,12 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
%define gitdate 20080814
%define gitdate 20080905
Summary: Mesa graphics libraries
Name: mesa
Version: 7.1
Release: 0.38%{?dist}
Version: 7.2
Release: 0.1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@ -29,13 +29,14 @@ Source0: %{name}-%{gitdate}.tar.bz2
Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh
Patch0: mesa-7.1pre-osmesa-version.patch
Patch1: mesa-fixes.patch
Patch2: mesa-7.1pre-nukeglthread-debug.patch
Patch0: mesa-7.1-osmesa-version.patch
Patch2: mesa-7.1-nukeglthread-debug.patch
Patch3: mesa-no-mach64.patch
Patch5: r300-cmdbuf.patch
Patch5: r300-bufmgr.patch
Patch7: mesa-7.1-link-shared.patch
Patch8: intel-mmio-fix.patch
Patch12: mesa-7.1-disable-intel-classic-warn.patch
@ -164,10 +165,11 @@ This package provides some demo applications for testing Mesa.
#%setup -q -n Mesa-%{version}pre -b1 -b2
%setup -q -n mesa-%{gitdate} -b2
%patch0 -p1 -b .osmesa
%patch1 -p1 -b .fixes
%patch2 -p1 -b .intel-glthread
%patch5 -p1 -b .r300cmdbuf
%patch3 -p0 -b .no-mach64
%patch5 -p1 -b .r300-bufmgr
%patch7 -p1 -b .dricore
%patch8 -p1 -b .intel-mmio
%patch12 -p1 -b .intel-nowarn
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
@ -240,7 +242,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
%if %{with_dri}
install -d $RPM_BUILD_ROOT%{_libdir}/dri
install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do
for f in i810 i915 i965 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do
so=%{_lib}/${f}_dri.so
test -e $so && echo $so
done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
@ -308,8 +310,8 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/GL/xmesa_xf86.h
%dir %{_includedir}/GL/internal
%{_includedir}/GL/internal/dri_interface.h
%{_includedir}/GL/internal/dri_sarea.h
%{_libdir}/libGL.so
%{_libdir}/pkgconfig/dri.pc
%{_libdir}/pkgconfig/gl.pc
%{_datadir}/man/man3/gl[^uX]*.3gl*
%{_datadir}/man/man3/glX*.3gl*
@ -356,6 +358,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/cubemap
%{_bindir}/drawpix
%{_bindir}/engine
%{_bindir}/fbo_firecube
%{_bindir}/fire
%{_bindir}/fogcoord
%{_bindir}/fplight
@ -402,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data
%changelog
* Fri Sep 05 2008 Dave Airlie <airlied@redhat.com> 7.2-0.1
- latest snapshot - r300 bufmgr code
- stop building mach64, patch around some intel issues
* Thu Aug 28 2008 Dave Airlie <airlied@redhat.com> 7.1-0.38
- latest Mesa snapshot - re-enable tex offset
- add r300 command buffer support on top of snapshot

1123
r300-cmdbuf.patch → r300-bufmgr.patch
View File

File diff suppressed because it is too large Load Diff

2
sources
View File

@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
937234d8b7b8528295b7080fbcf0a532 mesa-20080814.tar.bz2
d5e2a6d63b4611ec38aaab19b8f68117 mesa-20080905.tar.bz2