OSDN Git Service
Kristian Høgsberg [Wed, 17 Oct 2007 14:14:55 +0000 (10:14 -0400)]
Fixup a couple of thinkos in glxinfo changes.
Kristian Høgsberg [Tue, 16 Oct 2007 20:07:47 +0000 (16:07 -0400)]
Handle fbconfigs and glx visuals separately.
The old implementation fetches fbconfigs or glx visuals once and assumes the list
describes both fbconfigs and glx visuals. This patch splits it up and fetches
visuals and fbconfigs in two steps and keep the two lists separate. A server
could have no glx visuals or no glx fbconfigs and the old code wouldn't know the
difference.
Kristian Høgsberg [Tue, 16 Oct 2007 20:01:34 +0000 (16:01 -0400)]
Implement support for printing glx fbconfigs in glxinfo.
Kristian Høgsberg [Tue, 16 Oct 2007 00:12:01 +0000 (20:12 -0400)]
glxinfo: Only print visuals that actually support GLX.
Michel Dänzer [Tue, 16 Oct 2007 13:48:46 +0000 (15:48 +0200)]
i915: Make sure extensions that require TTM actually work.
Dave Airlie [Tue, 16 Oct 2007 11:10:44 +0000 (22:10 +1100)]
i915: fixup TTM interfaces to follow drm changes
Michel Dänzer [Tue, 16 Oct 2007 11:01:44 +0000 (13:01 +0200)]
i915: Re-enable __DRItexOffsetExtension.
This seems to have got lost somehow during the recent DRI interface changes.
Brian [Tue, 16 Oct 2007 00:00:17 +0000 (18:00 -0600)]
fix fog, rescale_normals bugs (from gallium branch)
Kristian Høgsberg [Mon, 15 Oct 2007 16:16:45 +0000 (12:16 -0400)]
Roll back premature version bump.
Kristian Høgsberg [Thu, 30 Aug 2007 17:05:59 +0000 (13:05 -0400)]
Dont add fbconfigs to array that we didn't allocate for.
Andreas Micheler [Mon, 15 Oct 2007 14:26:03 +0000 (08:26 -0600)]
faster write_rgba_span_front()
George Sapountzis [Sun, 14 Oct 2007 17:33:56 +0000 (20:33 +0300)]
typo
George Sapountzis [Tue, 25 Sep 2007 09:49:29 +0000 (12:49 +0300)]
Add GL_CORE_WINDOWS define to glcore.h
This is for consistency with glproto. The GL_CORE defines should probably be
dropped.
----
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:35:05 2004 +0000
Bug 782: Merge native OpenGL for Windows from CYGWIN branch
George Sapountzis [Sun, 14 Oct 2007 16:59:33 +0000 (19:59 +0300)]
Drop include "dri_interface.h" from xf86dri.h
Thanks to dri2, xf86dri no longer uses __DRI types.
Kristian Høgsberg [Thu, 30 Aug 2007 17:00:20 +0000 (13:00 -0400)]
Do XSync() before resetting error handler.
Kristian Høgsberg [Mon, 27 Aug 2007 18:15:49 +0000 (14:15 -0400)]
Uncomment GLX_SGIX_pbuffer definition.
Kristian Høgsberg [Mon, 27 Aug 2007 18:16:30 +0000 (14:16 -0400)]
Get the width and height from the attrib list in glXCreatePbuffer.
Kristian Høgsberg [Fri, 12 Oct 2007 23:35:04 +0000 (19:35 -0400)]
Merge branch 'dri2'
Conflicts:
src/mesa/drivers/dri/i915/intel_screen.c
Dave Airlie [Fri, 12 Oct 2007 01:02:46 +0000 (11:02 +1000)]
Merge branch 'master' into i915-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
Dave Airlie [Fri, 12 Oct 2007 00:59:38 +0000 (10:59 +1000)]
dri: remove ttm common code since superioctl is device specific
Dave Airlie [Fri, 12 Oct 2007 00:56:25 +0000 (10:56 +1000)]
i915: fixup reloc header defines
Brian [Fri, 12 Oct 2007 00:25:12 +0000 (18:25 -0600)]
Example of cooperative rendering into one window by two processes
Brian [Thu, 11 Oct 2007 22:39:02 +0000 (16:39 -0600)]
New glxsnoop demo to display another window's z/stencil/back buffer.
Kristian Høgsberg [Thu, 11 Oct 2007 16:49:26 +0000 (12:49 -0400)]
Drop no longer implemented MESA allocate extension from i915.
Brian [Thu, 11 Oct 2007 16:33:31 +0000 (10:33 -0600)]
remove unneeded cast
Kristian Høgsberg [Thu, 7 Jun 2007 23:35:54 +0000 (19:35 -0400)]
Add a version field to __DRIextension.
Kristian Høgsberg [Tue, 22 May 2007 16:26:02 +0000 (12:26 -0400)]
Move new texOffset extension to the new extension mechanism.
Kristian Høgsberg [Thu, 17 May 2007 20:11:19 +0000 (16:11 -0400)]
Convert a left-over private void * to __DRIcontext *.
Kristian Høgsberg [Thu, 17 May 2007 19:47:47 +0000 (15:47 -0400)]
Move enabling of DRI extensions into glxextensions.c
Kristian Høgsberg [Thu, 17 May 2007 19:33:14 +0000 (15:33 -0400)]
Remove now unused getProcAddress from DRIinterfaceMethods.
Kristian Høgsberg [Thu, 17 May 2007 18:39:06 +0000 (14:39 -0400)]
Add a DRI_ReadDrawable marker extension to signal read drawable capability.
Kristian Høgsberg [Wed, 16 May 2007 22:13:41 +0000 (18:13 -0400)]
Move media stream counter entry points to new extension.
Kristian Høgsberg [Wed, 16 May 2007 19:50:40 +0000 (15:50 -0400)]
Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.
Kristian Høgsberg [Wed, 16 May 2007 18:10:29 +0000 (14:10 -0400)]
Move GLX_MESA_allocate_memory related functions to new extension mechanism.
Kristian Høgsberg [Tue, 15 May 2007 20:09:44 +0000 (16:09 -0400)]
Move swap_interval to new extension mechanism.
Kristian Høgsberg [Tue, 15 May 2007 19:17:30 +0000 (15:17 -0400)]
Move the copySubBuffer extension over to the new mechanism.
Kristian Høgsberg [Tue, 15 May 2007 16:31:31 +0000 (12:31 -0400)]
Implement new screen extension API.
This new API lets the loader examine DRI level extensions provided by the
driver in a forward compatible manner.
Much of the churn in the DRI interface is adding support for new
extensions or removing old, unused extensions. This new extension
mechanism lets the loader query the extensions provided by the driver
and implement the extensions it knows about. Deprecating extensions
is done by not exporting that extension in the list, which doesn't
require keeping old function pointers around to preserve ABI.
Kristian Høgsberg [Mon, 14 May 2007 21:07:16 +0000 (17:07 -0400)]
Stop passing in unused fbconfigs to createNewScreen.
Kristian Høgsberg [Mon, 14 May 2007 20:58:37 +0000 (16:58 -0400)]
Pull createNewScreen entry point into dri_util.c.
This pulls the top level createNewScreen entry point out of the drivers
and rewrites __driUtilCreateNewScreen in dri_util.c to be the new entry point.
The change moves more logic into the common/ layer and changes the
createNewScreen entry point to only be defined in one place.
Kristian Høgsberg [Mon, 14 May 2007 20:37:19 +0000 (16:37 -0400)]
Replace open-coded major, minor, and patch version fields with __DRIversionRec.
Kristian Høgsberg [Fri, 11 May 2007 20:43:20 +0000 (16:43 -0400)]
Convert all DRI entrypoints to take pointers to __DRI* types.
The entrypoints take a mix of __DRIscreen * and void * (screen private)
arguments (similarly for contexts and drawables). This patch does away
with passing the private void pointer and always only passes the fully
typed __DRIscreen pointer and always as the first argument.
This makes the interface more consistent and increases type safety, and
catches a bug where we would pass a screen private to DRIdrawable::getSBC.
Kristian Høgsberg [Fri, 11 May 2007 20:11:23 +0000 (16:11 -0400)]
Remove screenConfigs from __DRIscreen.
The screenConfigs field of __DRIscreen points back to the containing
__GLXscreenConfigs struct. This is a serious abstraction violation; it
assumes that the loader is libGL and that there *is* a __GLXscreenConfigs
type in the loader.
Using the containerOf macro, we can get from the __DRIscreen pointer to
the containing __GLXscreenConfigs struct, at a place in the stack
where the above is a valid assumption. Besides, the __DRI* structs shouldn't
hold state other than the private pointer.
Kristian Høgsberg [Fri, 11 May 2007 17:54:44 +0000 (13:54 -0400)]
Drop mostly unused __DRIid typedef.
Kristian Høgsberg [Fri, 11 May 2007 17:24:34 +0000 (13:24 -0400)]
Avoid deadlock in GarbageCollectDRIDrawables.
__glXinitialize() can't be called with the GLX lock held. Just
pass in the __GLXscreenConfigs pointer so we don't have to look it
up in __GLXdisplayPrivate.
Kristian Høgsberg [Thu, 10 May 2007 22:38:49 +0000 (18:38 -0400)]
Drop createContext and destroyContext from DRIinterfaceMethods.
As for createDrawable and destroyDrawable, these functions immediately
upon entry to driCreateNewContext and immediately before exit from
driDestroyContext. Instead of passing function pointers back and forth
just obtain the drm_context_t prior to calling DRIscreen::createNewContext
and pass it as a parameter.
This change also lets us keep the DRI context XID in the libGL loader only.
Kristian Høgsberg [Thu, 10 May 2007 21:14:38 +0000 (17:14 -0400)]
Drop createDrawable and destroyDrawable fron DRIinterfaceMethods.
All the DRI driver did was call the createDrawable callback immediately
upon entry to DRIscreen::createNewDrawable to get the drm_drawable_t.
We can just call that before calling into the DRI driver and pass the
returned drm_drawable_t as an argument to the DRI entry point.
Likewise for destroyDrawable.
Also, DRIdrawablePrivate::draw isn't used anywhere, and since the
driver no longer needs the XID of the drawable we can now drop that.
Kristian Høgsberg [Wed, 10 Oct 2007 21:07:01 +0000 (17:07 -0400)]
Key drm_i915_flip_t typedef off of the ioctl #define instead.
Kristian Høgsberg [Thu, 10 May 2007 19:52:22 +0000 (15:52 -0400)]
Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.
Many DRI entry points took a __DRInativeDisplay pointer and a screen
index as arguments. The only use for the native display pointer was to
pass it back to the loader when looking up the __DRIscreen for the given
screen index.
Instead, let's just pass in the __DRIscreen pointer directly, which
let's drop the __DRInativeDisplay type and the getScreen function.
The assumption is now that the loader will be able to retrieve context
from the __DRIscreen pointer when necessary.
Brian [Wed, 10 Oct 2007 16:56:48 +0000 (10:56 -0600)]
replace 'brick' with correct program name in printfs
Mrc Gran [Wed, 10 Oct 2007 15:15:42 +0000 (09:15 -0600)]
fix force_s3tc_enable option
Dan Nicholson [Sat, 29 Sep 2007 18:23:22 +0000 (11:23 -0700)]
Ignore more generated files in progs/
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
Brian [Tue, 9 Oct 2007 18:36:56 +0000 (12:36 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Dave Airlie [Tue, 9 Oct 2007 04:36:04 +0000 (14:36 +1000)]
i915: workout max relocs from batch buffer size
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
Sergio Monteiro Basto [Mon, 8 Oct 2007 18:09:38 +0000 (11:09 -0700)]
Jerome Glisse [Sun, 7 Oct 2007 20:49:56 +0000 (22:49 +0200)]
r300: fragprog tex instruction now take writemask into acount.
Patrice Mandin [Sat, 6 Oct 2007 00:30:24 +0000 (02:30 +0200)]
nouveau: move nv10 clear command, for usage by other gpu
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
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
Kristian Høgsberg [Tue, 1 May 2007 01:05:10 +0000 (21:05 -0400)]
Add macros to generate CreateNewScreen entrypoint.
Kristian Høgsberg [Sun, 7 Jan 2007 13:12:01 +0000 (08:12 -0500)]
Remove XIDs from DRI interface (see #5714).
Kristian Høgsberg [Sun, 29 Apr 2007 19:05:02 +0000 (15:05 -0400)]
Pull in the drm hash.
Dave Airlie [Fri, 5 Oct 2007 02:15:50 +0000 (12:15 +1000)]
i915: add copyrights to new files
Dave Airlie [Fri, 5 Oct 2007 02:12:33 +0000 (12:12 +1000)]
i915: increase batchbuffer back to 16k
Eric Anholt [Thu, 4 Oct 2007 19:07:25 +0000 (12:07 -0700)]
[965] Replace various alignment code with a shared ALIGN() macro.
In the process, fix some alignment issues:
- Scratch space allocation was aligned into units of 1KB, while the allocation
wanted units of bytes, so we never allocated enough space for scratch.
- GRF register count was programmed as ALIGN(val - 1, 16) / 16 instead of
ALIGN(val, 16) / 16 - 1, which overcounted for val != 16n+1.
Eric Anholt [Thu, 4 Oct 2007 18:16:50 +0000 (11:16 -0700)]
Replace bmBufferOffset usage in batchbuffer setup with OUT_RELOC.
This is in preparation for 965 TTM.
Eric Anholt [Wed, 3 Oct 2007 23:59:01 +0000 (16:59 -0700)]
Replace duplicated intel_reg.h with a shared header.
Eric Anholt [Wed, 3 Oct 2007 23:30:42 +0000 (16:30 -0700)]
Replace some structure-based batch preparation with plain OUT_BATCH.
OUT_BATCH is far more amenable to the upcoming relocations being done for TTM
support.
Eric Anholt [Fri, 28 Sep 2007 20:51:13 +0000 (13:51 -0700)]
FreeBSD: more /usr/X11R6->/usr/local
Maarten Maathuis [Thu, 4 Oct 2007 17:08:37 +0000 (19:08 +0200)]
nouveau: Replace removed device classes with their proper labels.
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.
Roland Scheidegger [Wed, 3 Oct 2007 20:20:44 +0000 (22:20 +0200)]
minor fog calc cleanup
Michel Dänzer [Wed, 3 Oct 2007 09:25:59 +0000 (11:25 +0200)]
i915: Only align texture pitch to 64 bytes when textures can be render targets.
Michel Dänzer [Wed, 3 Oct 2007 08:48:56 +0000 (10:48 +0200)]
i915: Work around texture pitch related performance drops on i915 at least.
Dave Airlie [Wed, 3 Oct 2007 06:54:59 +0000 (16:54 +1000)]
i915: add superioctl initial support inside bufmgr ttm
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.
Brian [Tue, 2 Oct 2007 22:50:40 +0000 (16:50 -0600)]
fix comment: s/branch/kill/
Brian [Mon, 1 Oct 2007 23:55:33 +0000 (17:55 -0600)]
updated glext.h license info (Khronos), plus other clean-ups
Brian [Sat, 29 Sep 2007 18:01:34 +0000 (12:01 -0600)]
fix VBO-split infinite loop (bug 12164)
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.
Dan Nicholson [Sat, 29 Sep 2007 00:42:21 +0000 (18:42 -0600)]
add support for LDFLAGS env var
Brian [Sat, 29 Sep 2007 00:39:41 +0000 (18:39 -0600)]
update the DRM/DRI instructions
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.
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.
Eric Anholt [Thu, 27 Sep 2007 22:06:06 +0000 (15:06 -0700)]
[965] Add batchbuffer dumping under INTEL_DEBUG=bat, like 915.
Eric Anholt [Thu, 27 Sep 2007 18:29:11 +0000 (11:29 -0700)]
FreeBSD: Chase /usr/X11R6 death (replaced by everything in one prefix).
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.
Eric Anholt [Thu, 27 Sep 2007 17:16:04 +0000 (10:16 -0700)]
WIP 965 conversion to dri_bufmgr.
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.
Brian [Thu, 27 Sep 2007 16:35:37 +0000 (10:35 -0600)]
for Miniglx, use git sources
Brian [Thu, 27 Sep 2007 16:24:17 +0000 (10:24 -0600)]
Restore old _TriangleCaps code to fix Blender problem (bug 12164)
Brian [Thu, 27 Sep 2007 16:23:32 +0000 (10:23 -0600)]
tweak point rast to fix conform failure
Xiang, Haihao [Thu, 27 Sep 2007 08:14:57 +0000 (16:14 +0800)]
i965: handle all unfilled mode in clip stage. fix bug #12453
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
Zou Nan hai [Thu, 27 Sep 2007 05:49:35 +0000 (13:49 +0800)]
fix ppracer and bzflag issue with clip optimization
Dave Airlie [Thu, 27 Sep 2007 01:15:42 +0000 (11:15 +1000)]
i915/i965 merge serer directories along lines for radeon/r200
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
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
Dave Airlie [Tue, 25 Sep 2007 06:22:00 +0000 (16:22 +1000)]
drm: update bufmgr code to reflect changes in drm interface