mesa.git
16 years agoi915: only enable TTM path if drm minor is > 11 for superioctl
Dave Airlie [Fri, 12 Oct 2007 01:01:17 +0000 (11:01 +1000)]
i915: only enable TTM path if drm minor is > 11 for superioctl

16 years agodri: remove ttm common code since superioctl is device specific
Dave Airlie [Fri, 12 Oct 2007 00:59:38 +0000 (10:59 +1000)]
dri: remove ttm common code since superioctl is device specific

16 years agoi915: fixup reloc header defines
Dave Airlie [Fri, 12 Oct 2007 00:56:25 +0000 (10:56 +1000)]
i915: fixup reloc header defines

16 years agoi915: workout max relocs from batch buffer size
Dave Airlie [Tue, 9 Oct 2007 04:36:04 +0000 (14:36 +1000)]
i915: workout max relocs from batch buffer size

16 years agoi915: fixup up bufmgr to pass num buffers to kernel
Dave Airlie [Tue, 9 Oct 2007 02:18:50 +0000 (12:18 +1000)]
i915: fixup up bufmgr to pass num buffers to kernel

remove unneeded entry points

16 years agoi915: drop complex list handling for now
Dave Airlie [Fri, 5 Oct 2007 04:41:32 +0000 (14:41 +1000)]
i915: drop complex list handling for now

If this proves a win later we can add it back but at the moment
I don't think it's required yet

16 years agoi915: clean up lists on teardown
Dave Airlie [Fri, 5 Oct 2007 04:33:18 +0000 (14:33 +1000)]
i915: clean up lists on teardown

also fix a use of uninitialised pointer

16 years agoi915: add copyrights to new files
Dave Airlie [Fri, 5 Oct 2007 02:15:50 +0000 (12:15 +1000)]
i915: add copyrights to new files

16 years agoi915: increase batchbuffer back to 16k
Dave Airlie [Fri, 5 Oct 2007 02:12:33 +0000 (12:12 +1000)]
i915: increase batchbuffer back to 16k

16 years agoi915: add superioctl support to the ttm codepaths.
Dave Airlie [Thu, 4 Oct 2007 05:31:47 +0000 (15:31 +1000)]
i915: add superioctl support to the ttm codepaths.

gears now runs for about 10-15 seconds with some artifacts before falling
over.

16 years agoi915: add superioctl initial support inside bufmgr ttm
Dave Airlie [Wed, 3 Oct 2007 06:54:59 +0000 (16:54 +1000)]
i915: add superioctl initial support inside bufmgr ttm

16 years agoi915/drmbuf: attempt to push relocations into buffer manager
Dave Airlie [Wed, 3 Oct 2007 05:50:46 +0000 (15:50 +1000)]
i915/drmbuf: attempt to push relocations into buffer manager

This moves the relocations into the buffer manager in prepration for
a superioctl move.

16 years agoupdated glext.h license info (Khronos), plus other clean-ups
Brian [Mon, 1 Oct 2007 23:55:33 +0000 (17:55 -0600)]
updated glext.h license info (Khronos), plus other clean-ups

16 years agofix VBO-split infinite loop (bug 12164)
Brian [Sat, 29 Sep 2007 18:01:34 +0000 (12:01 -0600)]
fix VBO-split infinite loop (bug 12164)

16 years agor200: Implement SetTexOffset hook.
Chris Rankin [Sat, 29 Sep 2007 16:14:06 +0000 (18:14 +0200)]
r200: Implement SetTexOffset hook.

Implementation guidance by Michel Dänzer, final testing by Timo Aaltonen.

16 years agoadd support for LDFLAGS env var
Dan Nicholson [Sat, 29 Sep 2007 00:42:21 +0000 (18:42 -0600)]
add support for LDFLAGS env var

16 years agoupdate the DRM/DRI instructions
Brian [Sat, 29 Sep 2007 00:39:41 +0000 (18:39 -0600)]
update the DRM/DRI instructions

16 years agoRemove test for EXT_blend_logic_op in glGetString when determining GL version.
Brian [Fri, 28 Sep 2007 22:06:01 +0000 (16:06 -0600)]
Remove test for EXT_blend_logic_op in glGetString when determining GL version.

EXT_blend_logic_op is slightly different from GL 1.1's RGBA logicop mode
and does not have to be supported.  Per conversation with Roland.

16 years agoGo back to using old drm_i915_flip_t field name
Jesse Barnes [Fri, 28 Sep 2007 17:11:52 +0000 (10:11 -0700)]
Go back to using old drm_i915_flip_t field name

This field shouldn't have been renamed in the first place.  Go back to using
the old name so that the tree is backward and forward compatible again.

16 years ago[965] Add batchbuffer dumping under INTEL_DEBUG=bat, like 915.
Eric Anholt [Thu, 27 Sep 2007 22:06:06 +0000 (15:06 -0700)]
[965] Add batchbuffer dumping under INTEL_DEBUG=bat, like 915.

16 years agoFreeBSD: Chase /usr/X11R6 death (replaced by everything in one prefix).
Eric Anholt [Thu, 27 Sep 2007 18:29:11 +0000 (11:29 -0700)]
FreeBSD: Chase /usr/X11R6 death (replaced by everything in one prefix).

16 years agoRevert "WIP 965 conversion to dri_bufmgr."
Eric Anholt [Thu, 27 Sep 2007 22:11:39 +0000 (15:11 -0700)]
Revert "WIP 965 conversion to dri_bufmgr."

This reverts commit b2f1aa2389473ed09170713301b042661d70a48e.

Somehow I ended up with my branch's save-this-while-I-work-on-master commit
actually on master.

16 years agoWIP 965 conversion to dri_bufmgr.
Eric Anholt [Thu, 27 Sep 2007 17:16:04 +0000 (10:16 -0700)]
WIP 965 conversion to dri_bufmgr.

16 years ago[965] Remove AUB file support.
Eric Anholt [Wed, 26 Sep 2007 20:57:08 +0000 (13:57 -0700)]
[965] Remove AUB file support.

This code existed to dump logs of hardware access to be replayed in simulation.
Since we have real hardware now, it's not really needed.

16 years agofor Miniglx, use git sources
Brian [Thu, 27 Sep 2007 16:35:37 +0000 (10:35 -0600)]
for Miniglx, use git sources

16 years agoRestore old _TriangleCaps code to fix Blender problem (bug 12164)
Brian [Thu, 27 Sep 2007 16:24:17 +0000 (10:24 -0600)]
Restore old _TriangleCaps code to fix Blender problem (bug 12164)

16 years agotweak point rast to fix conform failure
Brian [Thu, 27 Sep 2007 16:23:32 +0000 (10:23 -0600)]
tweak point rast to fix conform failure

16 years agoi965: handle all unfilled mode in clip stage. fix bug #12453
Xiang, Haihao [Thu, 27 Sep 2007 08:14:57 +0000 (16:14 +0800)]
i965: handle all unfilled mode in clip stage. fix bug #12453

16 years agomesa: make sure the gotten value isn't greater than the
Xiang, Haihao [Thu, 27 Sep 2007 07:52:01 +0000 (15:52 +0800)]
mesa: make sure the gotten value isn't greater than the
max depth buffer value on 64bit system. fix bug #12095

16 years ago fix ppracer and bzflag issue with clip optimization
Zou Nan hai [Thu, 27 Sep 2007 05:49:35 +0000 (13:49 +0800)]
  fix ppracer and bzflag issue with clip optimization

16 years agoi915/i965 merge serer directories along lines for radeon/r200
Dave Airlie [Thu, 27 Sep 2007 01:15:42 +0000 (11:15 +1000)]
i915/i965 merge serer directories along lines for radeon/r200

16 years agoi965: The cube map texture coordinates must be devided by the
Xiang, Haihao [Wed, 26 Sep 2007 08:42:50 +0000 (16:42 +0800)]
i965: The cube map texture coordinates must be devided by the
component with the largest absolute value before they are
delivered. fix bug #12421

16 years ago fix a bug in 965 ARB_occlusion_query,
Zou Nan hai [Wed, 26 Sep 2007 02:00:41 +0000 (10:00 +0800)]
 fix a bug in 965 ARB_occlusion_query,
 fd.o bug #12132

16 years agodrm: update bufmgr code to reflect changes in drm interface
Dave Airlie [Tue, 25 Sep 2007 06:22:00 +0000 (16:22 +1000)]
drm: update bufmgr code to reflect changes in drm interface

16 years ago[i965] Bug #11812: Fix fwrite return value checks in AUB file code.
Roland Bär [Mon, 24 Sep 2007 20:47:26 +0000 (13:47 -0700)]
[i965] Bug #11812: Fix fwrite return value checks in AUB file code.

16 years agoRemove leftover code for i915_texprog.c noticed in crossbar review.
Eric Anholt [Mon, 24 Sep 2007 20:36:56 +0000 (13:36 -0700)]
Remove leftover code for i915_texprog.c noticed in crossbar review.

16 years agoFix progs/tests/ build with BSD make.
Eric Anholt [Mon, 24 Sep 2007 17:26:56 +0000 (10:26 -0700)]
Fix progs/tests/ build with BSD make.

16 years agoUpdate .gitignore for tests and xdemos.
Eric Anholt [Mon, 24 Sep 2007 17:26:40 +0000 (10:26 -0700)]
Update .gitignore for tests and xdemos.

16 years agoJust use stddef.h to get ptrdiff_t instead of obsolete malloc.h.
Eric Anholt [Mon, 24 Sep 2007 17:22:31 +0000 (10:22 -0700)]
Just use stddef.h to get ptrdiff_t instead of obsolete malloc.h.

16 years agoMove i915tex driver into place as just i915.
Eric Anholt [Mon, 24 Sep 2007 17:03:25 +0000 (10:03 -0700)]
Move i915tex driver into place as just i915.

16 years agoRemove the old i915 driver now that i915tex works without TTM.
Eric Anholt [Mon, 24 Sep 2007 16:55:16 +0000 (09:55 -0700)]
Remove the old i915 driver now that i915tex works without TTM.

16 years ago fix fd.o bug #12217, recalcuate urb when clip plane size change
Zou Nan hai [Mon, 24 Sep 2007 08:48:55 +0000 (16:48 +0800)]
 fix fd.o bug #12217, recalcuate urb when clip plane size change

16 years agofix DrawRangeElements error msg
Brian [Sun, 23 Sep 2007 19:56:46 +0000 (13:56 -0600)]
fix DrawRangeElements error msg

16 years agoMerge branch 'i915-unification'
Eric Anholt [Sat, 22 Sep 2007 00:05:34 +0000 (17:05 -0700)]
Merge branch 'i915-unification'

This branch replaces the DRM pool interface used by i915tex with a "dri_bufmgr"
interface in dri/common which may be set up to use either TTM or traditional
static memory management according to what is available.  The i915tex TTM
code now requires an updated DDX which provides proper buffer objects for the
static front/back/depth, instead of using fake buffers.  The driver is now
built as i915_dri.so, and should replace the old i915 driver shortly.

16 years agoFix buffer/fence reference counting due to Destroy vs Unreference difference.
Eric Anholt [Fri, 21 Sep 2007 23:16:54 +0000 (16:16 -0700)]
Fix buffer/fence reference counting due to Destroy vs Unreference difference.

While here, remove the unnecessary fence type saving for the wait ioctl, as
a 0 argument for type means "use your other saved copy".

16 years agofix -D_BSD_SOURC
Brian [Fri, 21 Sep 2007 00:42:47 +0000 (18:42 -0600)]
fix -D_BSD_SOURC

16 years agofixes for bluegene-xlc-osmesa config
Brian [Thu, 20 Sep 2007 21:11:14 +0000 (15:11 -0600)]
fixes for bluegene-xlc-osmesa config

16 years agoAdded bluegene-xlc-osmesa config (Alexander Neundorf)
Brian [Thu, 20 Sep 2007 21:09:57 +0000 (15:09 -0600)]
Added bluegene-xlc-osmesa config (Alexander Neundorf)

16 years agoUniquely validate the batchbuffer-referenced buffers.
Eric Anholt [Thu, 20 Sep 2007 18:41:25 +0000 (11:41 -0700)]
Uniquely validate the batchbuffer-referenced buffers.

Otherwise, for multiple references by the batchbuffer, the kernel would see
the buffer already on the unfenced list and wait for it to leave the list
before continuing, leading to hanging and eventual -EBUSY.

16 years agoAdd disabled-by-default tracing of TTM bufmgr operations.
Eric Anholt [Thu, 20 Sep 2007 18:38:32 +0000 (11:38 -0700)]
Add disabled-by-default tracing of TTM bufmgr operations.

16 years agoFix flipped sign to strerror.
Eric Anholt [Thu, 20 Sep 2007 16:20:48 +0000 (09:20 -0700)]
Fix flipped sign to strerror.

16 years agoMerge branch 'master' into i915-unification
Eric Anholt [Wed, 19 Sep 2007 18:05:36 +0000 (11:05 -0700)]
Merge branch 'master' into i915-unification

Conflicts:

src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
src/mesa/drivers/dri/i915tex/intel_context.c

16 years agoi965: fix an error in brw_vs_tnl.c
Xiang, Haihao [Thu, 20 Sep 2007 09:42:13 +0000 (17:42 +0800)]
i965: fix an error in brw_vs_tnl.c

if the state of TEXMAT is changed, the VS isn't updated.

16 years agofix memory access error in vbo_bind_vertex_list
Xiang, Haihao [Thu, 20 Sep 2007 09:37:04 +0000 (17:37 +0800)]
fix memory access error in vbo_bind_vertex_list

16 years agonouveau: add GeForce 7300 SE to card list
Dave Airlie [Thu, 20 Sep 2007 03:36:31 +0000 (13:36 +1000)]
nouveau: add GeForce 7300 SE to card list

16 years agonouveau : nv1x use OUT_RING_CACHE_FORCE for NV10_TCL_PRIMITIVE_3D_PROJECTION_MATRIX...
Matthieu Castet [Wed, 19 Sep 2007 21:22:39 +0000 (23:22 +0200)]
nouveau : nv1x use OUT_RING_CACHE_FORCE for NV10_TCL_PRIMITIVE_3D_PROJECTION_MATRIX as strange results
appear when the matrix is partialy updated.

16 years agonouveau : add OUT_RING_CACHE_FORCE* to add stuff in the cache even if the value didn...
Matthieu Castet [Wed, 19 Sep 2007 21:20:13 +0000 (23:20 +0200)]
nouveau : add OUT_RING_CACHE_FORCE* to add stuff in the cache even if the value didn't change

16 years agonouveau : add GL_FOG_COLOR + fix a compil error
Matthieu Castet [Wed, 19 Sep 2007 17:57:55 +0000 (19:57 +0200)]
nouveau : add GL_FOG_COLOR + fix a compil error

16 years agoUpdate .gitignore for demos.
Eric Anholt [Wed, 19 Sep 2007 17:10:18 +0000 (10:10 -0700)]
Update .gitignore for demos.

16 years agoAdd missing -g in FreeBSD OPT_CFLAGS
Eric Anholt [Thu, 5 Jul 2007 23:57:53 +0000 (16:57 -0700)]
Add missing -g in FreeBSD OPT_CFLAGS

16 years agoReplace i915tex batchbuffer printout with a pretty-printed version.
Eric Anholt [Wed, 19 Sep 2007 16:56:43 +0000 (09:56 -0700)]
Replace i915tex batchbuffer printout with a pretty-printed version.

16 years agoEnable building the debug (env INTEL_DEBUG=list) code by default.
Eric Anholt [Wed, 19 Sep 2007 16:02:24 +0000 (09:02 -0700)]
Enable building the debug (env INTEL_DEBUG=list) code by default.

16 years agoi915: Quiet valgrind by initializing the seq value the kernel writes into.
Eric Anholt [Tue, 19 Jun 2007 22:15:40 +0000 (15:15 -0700)]
i915: Quiet valgrind by initializing the seq value the kernel writes into.

Also, add a couple of comments to the wait/emit IRQ functions.

16 years agonouveau: nv10: color logic op only for nv11+
Patrice Mandin [Wed, 19 Sep 2007 17:08:56 +0000 (19:08 +0200)]
nouveau: nv10: color logic op only for nv11+

16 years agoAdd some error reporting and a couple of assertions to TTM bufmgr.
Eric Anholt [Tue, 18 Sep 2007 22:46:16 +0000 (15:46 -0700)]
Add some error reporting and a couple of assertions to TTM bufmgr.

16 years agomesa: Always use the original mask to update stencil buffer
Xiang, Haihao [Tue, 18 Sep 2007 01:32:44 +0000 (09:32 +0800)]
mesa: Always use the original mask to update stencil buffer
in stencil_and_ztest_pixels. fix #12263

16 years agonouveau : avoid vertex_size / 4 for each vertex ops
Matthieu Castet [Sun, 16 Sep 2007 21:33:10 +0000 (23:33 +0200)]
nouveau : avoid vertex_size / 4 for each vertex ops

16 years agonouveau : use GLfloat instead of uint32_t. After all, our vertex attributes are float.
Matthieu Castet [Sun, 16 Sep 2007 21:19:22 +0000 (23:19 +0200)]
nouveau : use GLfloat instead of uint32_t. After all, our vertex attributes are float.

16 years agonouveau : implement nv10_render_points
Matthieu Castet [Sun, 16 Sep 2007 21:01:56 +0000 (23:01 +0200)]
nouveau : implement nv10_render_points

16 years agonouveau : fix nv10_render functions
Matthieu Castet [Sun, 16 Sep 2007 17:37:27 +0000 (19:37 +0200)]
nouveau : fix nv10_render functions
use _tnl_RenderClipped helper functions that will call the right driver callback
clean nv10_render_generic_primitive_elts to match nv10_render style

16 years agonouveau : opps I introduce a bug when cleaning vertex pos attribute swap patch
Matthieu Castet [Sun, 16 Sep 2007 16:57:03 +0000 (18:57 +0200)]
nouveau : opps I introduce a bug when cleaning vertex pos attribute swap patch

16 years agorevert a956184f70733bd22e2bbee515386da12302963f
Matthieu Castet [Sun, 16 Sep 2007 14:15:13 +0000 (16:15 +0200)]
revert a956184f70733bd22e2bbee515386da12302963f

16 years agonouveau : nv1x pos vertex attribute need to be the first in mesa.
Matthieu Castet [Sun, 16 Sep 2007 14:13:55 +0000 (16:13 +0200)]
nouveau : nv1x pos vertex attribute need to be the first in mesa.
Swap it latter in order it match hw format.

16 years agonouveau : use new nouveau_reg.h with correct Bracket in macro
Matthieu Castet [Fri, 14 Sep 2007 22:25:09 +0000 (00:25 +0200)]
nouveau : use new nouveau_reg.h with correct Bracket in macro

16 years agonouveau : check for nmesa->state_cache.atoms overflow
Matthieu Castet [Fri, 14 Sep 2007 20:13:52 +0000 (22:13 +0200)]
nouveau : check for nmesa->state_cache.atoms overflow

16 years agonouveau : fix NV10_TCL_PRIMITIVE_3D_CLIP_PLANE
Matthieu Castet [Fri, 14 Sep 2007 20:07:34 +0000 (22:07 +0200)]
nouveau : fix NV10_TCL_PRIMITIVE_3D_CLIP_PLANE

16 years agoadded copypix.c test (test glCopyPixels w/ pixel zoom)
Brian [Fri, 14 Sep 2007 15:58:32 +0000 (09:58 -0600)]
added copypix.c test (test glCopyPixels w/ pixel zoom)

16 years agofix copypixels overlap test bug (#12417)
Brian [Fri, 14 Sep 2007 15:57:57 +0000 (09:57 -0600)]
fix copypixels overlap test bug (#12417)

16 years agomesa: bind VBO_ATTRIB_XXX to correct input array when
Xiang, Haihao [Fri, 14 Sep 2007 08:26:56 +0000 (16:26 +0800)]
mesa: bind VBO_ATTRIB_XXX to correct input array when
executing a display list. fix #10604

16 years agoi965: align the address of the first element within
Xiang, Haihao [Fri, 14 Sep 2007 03:10:23 +0000 (11:10 +0800)]
i965: align the address of the first element within
the index buffer. (fix#11910)

16 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Thu, 13 Sep 2007 20:45:22 +0000 (14:45 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

16 years agoupdated vrml link
Brian [Thu, 13 Sep 2007 20:44:27 +0000 (14:44 -0600)]
updated vrml link

16 years agoFix timer problem when using Fortran bindings (submitted by Bill Mitchell)
Brian [Thu, 13 Sep 2007 20:42:23 +0000 (14:42 -0600)]
Fix timer problem when using Fortran bindings (submitted by Bill Mitchell)

Also, add some comments about what's going on.

16 years agonouveau : diable broken light enable on nv10
Matthieu Castet [Thu, 13 Sep 2007 20:13:39 +0000 (22:13 +0200)]
nouveau : diable broken light enable on nv10

16 years agoadded program_error2() function for better error reporting
Brian [Thu, 13 Sep 2007 17:41:49 +0000 (11:41 -0600)]
added program_error2() function for better error reporting

16 years agoFix state.texgen parsing error (bug 12313).
Brian [Thu, 13 Sep 2007 17:29:00 +0000 (11:29 -0600)]
Fix state.texgen parsing error (bug 12313).

Replace *(*inst++) with *(*inst)++ in a few places.

16 years agoadded .pc.in files to tarballs
Brian [Thu, 13 Sep 2007 15:27:10 +0000 (09:27 -0600)]
added .pc.in files to tarballs

16 years agoadded null ptr check
Brian [Thu, 13 Sep 2007 15:26:27 +0000 (09:26 -0600)]
added null ptr check

16 years agocheck return value of invert_matrix()
Jonathan Bestien-Filiatrault [Wed, 12 Sep 2007 22:21:13 +0000 (16:21 -0600)]
check return value of invert_matrix()

16 years agoAdd glut_fcb.c to the build and update to fix warnings (see bug 12405)
Brian [Wed, 12 Sep 2007 19:40:15 +0000 (13:40 -0600)]
Add glut_fcb.c to the build and update to fix warnings (see bug 12405)

16 years agoRename. "fcb" = fortran call back
Brian [Wed, 12 Sep 2007 19:37:10 +0000 (13:37 -0600)]
Rename.  "fcb" = fortran call back

16 years agoRemove unused plane->pipe mapping fields from SAREA private.
Jesse Barnes [Wed, 12 Sep 2007 16:03:44 +0000 (09:03 -0700)]
Remove unused plane->pipe mapping fields from SAREA private.

16 years agoupdated with pkg-config info
Brian [Wed, 12 Sep 2007 16:11:49 +0000 (10:11 -0600)]
updated with pkg-config info

16 years agopkg-config support
Dan Nicholson [Wed, 12 Sep 2007 16:03:05 +0000 (10:03 -0600)]
pkg-config support

16 years agoDESTDIR support.
Dan Nicholson [Wed, 12 Sep 2007 15:57:53 +0000 (09:57 -0600)]
DESTDIR support.

16 years agoi965: translate shadow compare function into correct
Xiang, Haihao [Wed, 12 Sep 2007 08:51:45 +0000 (16:51 +0800)]
i965: translate shadow compare function into correct
internal function to match the EXT_shadow_funs
spec. fix bug#11925

16 years agoi965: revert commit 1a15b2169ba6cb100627eb525a20a00537cfb6f0,
Xiang, Haihao [Wed, 12 Sep 2007 07:13:06 +0000 (15:13 +0800)]
i965: revert commit 1a15b2169ba6cb100627eb525a20a00537cfb6f0,
and keep the instruction state unchanged after calling
brw_emit_tri_setup/brw_emit_line_setup when building setup
thread for SF_UNFILLED_TRIS.

16 years agoprefix some include filenames with shader/
root [Tue, 11 Sep 2007 21:24:43 +0000 (15:24 -0600)]
prefix some include filenames with shader/

16 years agoFix-up #includes to remove some -I options.
Brian [Tue, 11 Sep 2007 16:57:37 +0000 (10:57 -0600)]
Fix-up #includes to remove some -I options.

eg: #include "shader/program.h" and remove -I$(TOP)/src/mesa/program

16 years agoIn _mesa_make_current(), don't unbind FBOs from the old context.
Brian [Tue, 11 Sep 2007 16:56:35 +0000 (10:56 -0600)]
In _mesa_make_current(), don't unbind FBOs from the old context.

This fixes the X server crash reported by KeithP on Aug 29.
The old context's FBOs will be unreferenced during context destruction so
there's no memleak with this change.