Benno Schulenberg [Thu, 8 Nov 2007 14:34:20 +0000 (07:34 -0700)]
fix Unichrome/Blender crash, bug 13142
Kristian Høgsberg [Tue, 6 Nov 2007 19:34:15 +0000 (14:34 -0500)]
Fix compilation for !GLX_DIRECT_RENDERING.
Kristian Høgsberg [Tue, 6 Nov 2007 18:32:04 +0000 (13:32 -0500)]
Remove a couple of "deprecated" fields from __GLXcontextRec.
The __GLXcontextRec struct is internal to the libGL implementation. No point
in "deprecating", just get rid of it.
Kristian Høgsberg [Tue, 6 Nov 2007 16:56:24 +0000 (11:56 -0500)]
Don't return 0 in a void function.
Michel Dänzer [Tue, 6 Nov 2007 17:24:46 +0000 (18:24 +0100)]
r200: Re-expose SetTexOffset functionality.
This seems to have been mismerged with the DRI interface changes.
Michel Dänzer [Tue, 6 Nov 2007 17:22:42 +0000 (18:22 +0100)]
r200: Fix SetTexOffset format for 16 bit pixmaps/textures.
Use symbolic array indices to clarify.
Kristian Høgsberg [Tue, 6 Nov 2007 16:22:59 +0000 (11:22 -0500)]
Pass the visual id to XF86DRICreateContextWithConfig(), not fbconfig id.
Oliver McFadden [Mon, 5 Nov 2007 22:05:16 +0000 (22:05 +0000)]
Renamed the R300_VAP_UNKNOWN_221C to R300_VAP_CLIP_CNTL.
Dave Airlie [Sun, 4 Nov 2007 04:02:55 +0000 (15:02 +1100)]
r300: initial user clipping for TCL paths
I've no idea if this code might break something or how it should interact
with vertex shaders, it makes the clip demo work for me
Kristian Høgsberg [Mon, 5 Nov 2007 22:02:03 +0000 (17:02 -0500)]
Lookup visual in visual list, not fbconfig list.
Also, handle visual not found error case by throwing X error.
Kristian Høgsberg [Mon, 5 Nov 2007 20:42:55 +0000 (15:42 -0500)]
Filter both visuals and fbconfigs against driver supported configs.
Brian [Mon, 5 Nov 2007 21:41:18 +0000 (14:41 -0700)]
Check for NULL VB->EdgeFlag array.
There might be a bug elsewhere, but this is a simple work-around for now.
See bug 12614
Brian [Mon, 5 Nov 2007 21:38:27 +0000 (14:38 -0700)]
fix mmx code (bug 12614)
Michel Dänzer [Mon, 5 Nov 2007 09:03:26 +0000 (10:03 +0100)]
Fix GLX build of xserver master branch.
The internal CreatePixmap API has been extended.
Brian [Sat, 3 Nov 2007 14:50:55 +0000 (08:50 -0600)]
Fix mem leak in SSE code generation path (Michel Dänzer) and don't crash if _mesa_exec_malloc() returns NULL.
(picked from mesa_7_0_branch)
Brian [Sat, 3 Nov 2007 14:46:59 +0000 (08:46 -0600)]
fix typo
Dave Airlie [Sat, 3 Nov 2007 08:35:39 +0000 (19:35 +1100)]
r300: move more vap registers out of non tcl paths
Dave Airlie [Sat, 3 Nov 2007 08:20:22 +0000 (19:20 +1100)]
r300: fix misnumber register
Dave Airlie [Sat, 3 Nov 2007 07:58:46 +0000 (18:58 +1100)]
r300: fix texwrap border color
Brian [Thu, 1 Nov 2007 14:00:45 +0000 (08:00 -0600)]
remove dead code in _mesa_new_program()
Dan Nicholson [Thu, 1 Nov 2007 13:01:53 +0000 (06:01 -0700)]
Add -fno-strict-aliasing workaround for all GCC targets
Use a GCC option to work around aliasing bugs. See commit
013dbcd for
more details.
Dave Airlie [Thu, 1 Nov 2007 08:19:45 +0000 (19:19 +1100)]
nouveau: ppc, swap fragment programs on big endian systems.
Thanks to the PS3 RSX project for figuring this out.
Dave Airlie [Wed, 31 Oct 2007 23:41:27 +0000 (10:41 +1100)]
i915: make i915 use the cached mappings for batch/buffer objects.
This should restore gears speed on 9xx hardware
Dan Nicholson [Wed, 31 Oct 2007 23:18:29 +0000 (16:18 -0700)]
configs: Set -fexceptions for GLUT on linux-dri like other targets
Quite a while ago, the GCC option -fexceptions was added for building
libglut. See here:
http://article.gmane.org/gmane.comp.video.mesa3d.devel/9499
This was missing in the linux-dri targets.
Dan Nicholson [Wed, 24 Oct 2007 01:17:16 +0000 (18:17 -0700)]
confdiff.sh: A testing script for comparing configs settings
This is a simple script that compares the make variables set by two
different configs stubs. The purpose is to highlight differences so
that any unnecessary duplication or divergence can be removed.
For example, on Linux x86:
$ ./bin/confdiff.sh linux linux-x86
The output isn't very clean, but it should highlight that the only
difference is that the x86 target uses x86 assembler sources.
The script uses bash, mktemp, make, sed and diff. It is probably not
very portable and might only work on GNU make.
Dan Nicholson [Wed, 31 Oct 2007 17:33:20 +0000 (10:33 -0700)]
configs: Always use -fPIC for shared libraries, never for static
Mesa currently disables -fPIC for DRI on x86, but most Linux distros are
re-enabling -fPIC for all DRI arches. Let's just do that here since
that's normally what's wanted for shared libraries. Some justification:
http://bugs.gentoo.org/show_bug.cgi?id=110840#c9
On the other hand, position-independent code is only necessary when
building shared libraries, so disable it for the static cases.
Dan Nicholson [Wed, 31 Oct 2007 16:47:39 +0000 (09:47 -0700)]
Add -fno-strict-aliasing workaround for Linux GCC targets
Most Linux distros work around aliasing problems in Mesa by compiling
with the GCC option -fno-strict-aliasing. Two examples:
https://bugs.freedesktop.org/show_bug.cgi?id=6046
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=394311
This makes -fno-strict-aliasing the default with a comment that
developers should consider commenting it out. There is a already a note
about these bugs in docs/helpwanted.html.
Brian [Wed, 31 Oct 2007 15:57:07 +0000 (09:57 -0600)]
GLSL support in i965 driver
Brian [Wed, 31 Oct 2007 15:44:01 +0000 (09:44 -0600)]
updated list
Brian [Wed, 31 Oct 2007 15:38:51 +0000 (09:38 -0600)]
check for count==0 in _mesa_validate_DrawArrays()
Michel Dänzer [Tue, 30 Oct 2007 16:47:17 +0000 (17:47 +0100)]
Fix some build warnings, mostly with XCB.
Brian [Tue, 30 Oct 2007 16:24:34 +0000 (10:24 -0600)]
Alias glStencilOpSeparateATI with glStencilOpSeparate.
Brian [Tue, 30 Oct 2007 16:23:58 +0000 (10:23 -0600)]
test glStencilFuncSeparateATI()
Brian [Tue, 30 Oct 2007 15:13:58 +0000 (09:13 -0600)]
Finish up ATI_separate_stencil
Add entrypoints to glapi XML file and regenerate files.
Implement glStencilOpSeparateATI().
Consolidate some code in stencil.c
Roland Scheidegger [Tue, 30 Oct 2007 13:09:17 +0000 (14:09 +0100)]
add missing _mesa_StencilFuncSeparateATI function
Michel Dänzer [Tue, 30 Oct 2007 12:16:50 +0000 (13:16 +0100)]
More vblank cleanups.
* Fix crash at context creation in most drivers supporting vblank.
* Don't pass vblank sequence or flags to functions that get passed the drawable
private already.
* Attempt to initialize vblank related drawable private fields just once
per drawable. May need more work in some drivers.
Eric Anholt [Mon, 29 Oct 2007 18:56:50 +0000 (11:56 -0700)]
[i915] Include header to pick up intel_ttm_bo_create_from_handle() proto.
Eric Anholt [Mon, 29 Oct 2007 20:24:27 +0000 (13:24 -0700)]
Merge branch 'origin'
Jesse Barnes [Mon, 29 Oct 2007 19:06:36 +0000 (12:06 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Jesse Barnes [Mon, 29 Oct 2007 18:56:31 +0000 (11:56 -0700)]
Refactor and fix core vblank support
Consolidate support for synchronizing to and retrieving vblank counters. Also
fix the core vblank code to return monotonic MSC counters, which are required
by some GLX extensions. Adding support for multiple pipes to a low level
driver is fairly easy, the Intel 965 driver provides simple example code (see
intel_buffers.c:intelWindowMoved()).
The new code bumps the media stream counter extension version to 2 and adds a
new getDrawableMSC callback. This callback takes a drawablePrivate pointer,
which is used to calculate the MSC value seen by clients based on the actual
vblank counter(s) returned from the kernel. The new drawable private fields
are as follows:
- vblSeq - used for tracking vblank counts for buffer swapping
- vblFlags - flags (e.g. current pipe), updated by low level driver
- msc_base - MSC counter from the last time the current pipe changed
- vblank_base - kernel DRM vblank counter from the last time the pipe changed
Using the above variables, the core vblank code (in vblank.c) can calculate a
monotonic MSC value. The low level DRI drivers are responsible for updating
the current pipe (by setting VBLANK_FLAG_SECONDARY for example in vblFlags)
along with msc_base and vblank_base whenever the pipe associated with a given
drawable changes (again, see intelWindowMoved for an example of this).
Drivers should fill in the GetDrawableMSC DriverAPIRec field to point to
driDrawableGetMSC32 and add code for pipe switching as outlined above to fully
support the new scheme.
Dan Nicholson [Mon, 29 Oct 2007 18:21:37 +0000 (11:21 -0700)]
Build xdemos programs by default on linux-dri
Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.
Chris Rankin [Mon, 29 Oct 2007 18:37:32 +0000 (14:37 -0400)]
Remember to call XSync() before resetting X error handler.
Dan Nicholson [Mon, 29 Oct 2007 18:17:04 +0000 (11:17 -0700)]
linux-dri-xcb: Fix undefined refs when linking with libGL
GL_LIB_DEPS was missing -lXdamage and -lXfixes, which was causing
linker errors when trying to build the programs.
Brian [Mon, 29 Oct 2007 16:01:15 +0000 (10:01 -0600)]
disable ctx->Driver.NewProgram() call in _mesa_new_program()
This was causing infinite recursive calls w/ software drivers.
All vertex/fragment shaders should be allocated by calling
ctx->Driver.NewProgram(), not by calling _mesa_new_program().
Dan Nicholson [Mon, 29 Oct 2007 15:05:13 +0000 (09:05 -0600)]
update APP_LIB_DEPS for static library configs (patch 3/3)
Dan Nicholson [Mon, 29 Oct 2007 15:04:30 +0000 (09:04 -0600)]
simplify APP_LIB_DEPS (patch 2/3)
Dan Nicholson [Mon, 29 Oct 2007 15:03:01 +0000 (09:03 -0600)]
specify app lib dependencies in Makefiles (patch 1/3)
Alan Hourihane [Sun, 28 Oct 2007 20:07:37 +0000 (20:07 +0000)]
Only set R_MODE with NV_point_sprite
Dan Nicholson [Fri, 26 Oct 2007 22:43:44 +0000 (15:43 -0700)]
configs: Fix linux-static to link correctly
The linux-static target was missing necessary libraries and hardcoding
their location to /usr/X11R6/lib. This makes it comparable to the x86
and x86-64 static targets.
Zou Nan hai [Fri, 26 Oct 2007 07:39:50 +0000 (15:39 +0800)]
Merge branch '965-glsl'
Conflicts:
src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/intel_context.c
Brian [Thu, 25 Oct 2007 20:46:35 +0000 (14:46 -0600)]
use grep -q
Dan Nicholson [Thu, 25 Oct 2007 18:34:16 +0000 (11:34 -0700)]
Ignore new programs
Brian [Thu, 25 Oct 2007 17:10:10 +0000 (11:10 -0600)]
simplify/fix the ASM_FLAGS tests (bug 12931)
Alex Neundorf [Wed, 24 Oct 2007 22:31:22 +0000 (16:31 -0600)]
added catamount-osmesa-pgi config
Brian [Wed, 24 Oct 2007 22:24:06 +0000 (16:24 -0600)]
don't build x86, x86-64 dirs if not needed
Brian [Wed, 24 Oct 2007 19:55:22 +0000 (13:55 -0600)]
fix assorted bugs, works now
Brian [Wed, 24 Oct 2007 18:43:02 +0000 (12:43 -0600)]
add to git
Brian [Wed, 24 Oct 2007 17:37:05 +0000 (11:37 -0600)]
Implement gl_PointCoord attribute for GLSL fragment shaders.
Contains the normalized fragment position within a point sprite.
Brian [Tue, 23 Oct 2007 16:55:24 +0000 (10:55 -0600)]
properly init dst reg's CondMask/Swizzle fields
Brian [Tue, 23 Oct 2007 16:24:53 +0000 (10:24 -0600)]
bump up MAX_INSTRUCTIONS and add an assertion to catch emitting too many instructions
Brian [Tue, 23 Oct 2007 14:22:21 +0000 (08:22 -0600)]
add directfb glut sources to tarball
Brian [Mon, 22 Oct 2007 23:50:17 +0000 (17:50 -0600)]
don't apply ColorMask to main gc
Kristian Høgsberg [Thu, 18 Oct 2007 19:19:08 +0000 (15:19 -0400)]
glxinfo: Try creating a GLX context using an fbconfig if no visuals are available.
Michel Dänzer [Thu, 18 Oct 2007 16:30:15 +0000 (18:30 +0200)]
i915: Add some sanity checks to blit command debugging code.
Ian Romanick [Wed, 17 Oct 2007 20:11:01 +0000 (13:11 -0700)]
Framework for supporting z24_s8 and z32 depth textures on r300.
Ian Romanick [Wed, 17 Oct 2007 19:07:04 +0000 (12:07 -0700)]
Initial support for ARB_depth_texture
Currently only GL_DEPTH_COMPONENT16 are supported. I don't know what the
hardware bits are to select the other formats, but it shouldn't be too hard
to figure out.
Ian Romanick [Wed, 17 Oct 2007 19:05:55 +0000 (12:05 -0700)]
Support cards that have ARB_fp but not ARB_shadow.
Ian Romanick [Wed, 17 Oct 2007 17:39:24 +0000 (10:39 -0700)]
mga: Enable (trivial) support for GL_APPLE_vertex_array_object, bump DRIVER_DATE
Ian Romanick [Wed, 17 Oct 2007 17:36:48 +0000 (10:36 -0700)]
mga: Enable (trivial) support for GL_EXT_gpu_program_parameters.
Kristian Høgsberg [Wed, 17 Oct 2007 21:03:33 +0000 (17:03 -0400)]
pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.
Brian [Wed, 17 Oct 2007 20:30:18 +0000 (14:30 -0600)]
Replace repeat_remainder() with a simpler macro that just casts args to unsigned.
Kristian Høgsberg [Wed, 17 Oct 2007 19:05:47 +0000 (15:05 -0400)]
Pull workaround for unset GLX_DRAWABLE_TYPE back in.
The old version just set GLX_DRAWABLE_TYPE to GLX_WINDOW_BIT for
configs received through glXGetVisualConfigs and to
GLX_WINDOW_BIT | GLX_PIXMAP_BIT for configs received as FBConfigs.
The X server needs to send this info, but keep the workaround for now.
Fixes #12835.
Kristian Høgsberg [Wed, 17 Oct 2007 18:43:35 +0000 (14:43 -0400)]
glxinfo: Also print number of fbconfigs.
Michel Dänzer [Wed, 17 Oct 2007 16:28:03 +0000 (18:28 +0200)]
Don't call the driver clear hook when the effective scissor rectangle is empty.
Michel Dänzer [Wed, 17 Oct 2007 16:26:31 +0000 (18:26 +0200)]
i915: Don't emit 'empty' blit rectangles.
The hardware seems to interpret them differently and produce unexpected
results...
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.
Eric Anholt [Tue, 16 Oct 2007 19:25:35 +0000 (12:25 -0700)]
Replace symlink generation from i915 with files in intel/ and symlinks there.
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.