Zou Nan hai
6ef27b88e6
Merge branch '965-glsl'
...
Conflicts:
src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/intel_context.c
2007-10-26 15:39:50 +08:00
Brian
ff042bfdee
use grep -q
2007-10-25 14:47:14 -06:00
Dan Nicholson
8578534f48
Ignore new programs
2007-10-25 11:34:16 -07:00
Brian
6dcf65ff0d
simplify/fix the ASM_FLAGS tests (bug 12931)
2007-10-25 11:10:10 -06:00
Alex Neundorf
cae5b7f1e3
added catamount-osmesa-pgi config
2007-10-24 16:31:22 -06:00
Brian
26479fa3b3
don't build x86, x86-64 dirs if not needed
2007-10-24 16:24:06 -06:00
Brian
55d4f32fc2
fix assorted bugs, works now
2007-10-24 13:55:22 -06:00
Brian
5e9272c748
add to git
2007-10-24 12:43:02 -06:00
Brian
e48f0b09ab
Implement gl_PointCoord attribute for GLSL fragment shaders.
...
Contains the normalized fragment position within a point sprite.
2007-10-24 11:37:05 -06:00
Brian
c9d495c6f0
properly init dst reg's CondMask/Swizzle fields
2007-10-23 10:55:24 -06:00
Brian
2a8e9bb00f
bump up MAX_INSTRUCTIONS and add an assertion to catch emitting too many instructions
2007-10-23 10:24:53 -06:00
Brian
e90dd4bf8f
add directfb glut sources to tarball
2007-10-23 08:22:21 -06:00
Brian
2667e5642f
don't apply ColorMask to main gc
2007-10-22 17:50:59 -06:00
Kristian Høgsberg
a074857cdc
glxinfo: Try creating a GLX context using an fbconfig if no visuals are available.
2007-10-18 15:19:38 -04:00
Michel Dänzer
950fff0f9a
i915: Add some sanity checks to blit command debugging code.
2007-10-18 18:30:15 +02:00
Ian Romanick
a663e846b6
Framework for supporting z24_s8 and z32 depth textures on r300.
2007-10-17 16:25:39 -07:00
Ian Romanick
42a4386a4c
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.
2007-10-17 16:25:39 -07:00
Ian Romanick
b961eccc92
Support cards that have ARB_fp but not ARB_shadow.
2007-10-17 16:25:39 -07:00
Ian Romanick
374158b044
mga: Enable (trivial) support for GL_APPLE_vertex_array_object, bump DRIVER_DATE
2007-10-17 16:25:39 -07:00
Ian Romanick
366b2c6902
mga: Enable (trivial) support for GL_EXT_gpu_program_parameters.
2007-10-17 16:25:38 -07:00
Kristian Høgsberg
aad5c0fdc7
pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.
2007-10-17 17:04:59 -04:00
Brian
ad053d90f0
Replace repeat_remainder() with a simpler macro that just casts args to unsigned.
2007-10-17 14:30:44 -06:00
Kristian Høgsberg
6c753ad51d
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 .
2007-10-17 15:06:11 -04:00
Kristian Høgsberg
a5b4bb393f
glxinfo: Also print number of fbconfigs.
2007-10-17 15:06:11 -04:00
Michel Dänzer
86b81ef5aa
Don't call the driver clear hook when the effective scissor rectangle is empty.
2007-10-17 18:37:19 +02:00
Michel Dänzer
b453112133
i915: Don't emit 'empty' blit rectangles.
...
The hardware seems to interpret them differently and produce unexpected
results...
2007-10-17 18:37:12 +02:00
Kristian Høgsberg
87966baa8d
Fixup a couple of thinkos in glxinfo changes.
2007-10-17 10:15:10 -04:00
Kristian Høgsberg
6c533ea2d1
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.
2007-10-16 16:07:52 -04:00
Kristian Høgsberg
791ad0e77f
Implement support for printing glx fbconfigs in glxinfo.
2007-10-16 16:07:52 -04:00
Kristian Høgsberg
f7d1d554b1
glxinfo: Only print visuals that actually support GLX.
2007-10-16 16:07:52 -04:00
Eric Anholt
919f617d08
Replace symlink generation from i915 with files in intel/ and symlinks there.
2007-10-16 12:38:55 -07:00
Michel Dänzer
3feefeeb35
i915: Make sure extensions that require TTM actually work.
2007-10-16 15:48:46 +02:00
Dave Airlie
70eb456a76
i915: fixup TTM interfaces to follow drm changes
2007-10-16 22:11:43 +11:00
Michel Dänzer
9c4d104e98
i915: Re-enable __DRItexOffsetExtension.
...
This seems to have got lost somehow during the recent DRI interface changes.
2007-10-16 13:01:44 +02:00
Brian
cab0dce676
fix fog, rescale_normals bugs (from gallium branch)
2007-10-15 18:00:55 -06:00
Kristian Høgsberg
7a88ecbd1a
Roll back premature version bump.
2007-10-15 12:16:45 -04:00
Kristian Høgsberg
a87e9a3479
Dont add fbconfigs to array that we didn't allocate for.
2007-10-15 10:59:06 -04:00
Andreas Micheler
157eeb5c3b
faster write_rgba_span_front()
2007-10-15 08:26:45 -06:00
George Sapountzis
f33e1a4403
typo
2007-10-14 20:33:56 +03:00
George Sapountzis
fe20ac2a6b
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
2007-10-14 20:11:00 +03:00
George Sapountzis
d7c137b0df
Drop include "dri_interface.h" from xf86dri.h
...
Thanks to dri2, xf86dri no longer uses __DRI types.
2007-10-14 20:08:31 +03:00
Kristian Høgsberg
c095f7e46a
Do XSync() before resetting error handler.
2007-10-13 18:46:01 -04:00
Kristian Høgsberg
d0b68b215d
Uncomment GLX_SGIX_pbuffer definition.
2007-10-13 18:45:05 -04:00
Kristian Høgsberg
8b20411915
Get the width and height from the attrib list in glXCreatePbuffer.
2007-10-13 18:44:52 -04:00
Kristian Høgsberg
f9c6dfc4d1
Merge branch 'dri2'
...
Conflicts:
src/mesa/drivers/dri/i915/intel_screen.c
2007-10-12 19:35:04 -04:00
Dave Airlie
bf805d3bf5
Merge branch 'master' into i915-superioctl
2007-10-12 11:02:46 +10:00
Dave Airlie
9e06cf00cf
i915: only enable TTM path if drm minor is > 11 for superioctl
2007-10-12 11:01:27 +10:00
Dave Airlie
ea2278bc79
dri: remove ttm common code since superioctl is device specific
2007-10-12 10:59:38 +10:00
Dave Airlie
7fc5c0307a
i915: fixup reloc header defines
2007-10-12 10:56:25 +10:00
Brian
72c888869f
Example of cooperative rendering into one window by two processes
2007-10-11 18:25:12 -06:00