Jeremy Huddleston
54654815fa
Darwin: Use __APPLE__ instead of __DARWIN__
2007-12-07 18:53:08 -08:00
Ben Byer
b6357cec6d
fixed pathname in GL/apple/Makefile.am
2007-12-07 01:51:53 -08:00
Jeremy Huddleston
2b2df4f517
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b
)
2007-11-26 14:11:01 -08:00
Jeremy Huddleston
86fc74a86b
Darwin: Makefile Style Fixes
...
* Fixed Makefile style to be consistent with self and downsteam
* Readded solaris to DIST_SUBDIRS in hw/xfree86/os-support/Makefile.am
2007-11-21 16:52:47 -08:00
Jeremy Huddleston
3b0201f893
Merge branch 'server-1.3-branch' into xorg-server-1.2-apple
...
Conflicts:
configure.ac
2007-11-19 20:27:52 -08:00
Ben Byer
f86d2ef33f
finished committing downstream changes
2007-11-19 02:38:18 -08:00
Ben Byer
b3dc1483f7
more patches, autoconf fixes...
2007-11-19 02:38:18 -08:00
Ben Byer
6ff9f43ae2
More patches from downstream
2007-11-19 02:38:18 -08:00
Keith Packard
7cf3a0e0b9
In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx.
...
As the driver EnterVT function generally re-enables the hardware and
prepares it for rendering, it must be called before any gl functions are
called which could touch the hardware.
(cherry picked from commit f24391dbfd
)
2007-04-09 12:59:10 -07:00
Drew Parsons
ee3000f97d
Support for Hurd and other non-linux GNU systems.
...
Non-linux GNU systems such as Hurd will define __GLIBC__ or __GNU__
rather than __linux__. This must be tested for in order to get byteswap.h
included. See commit 594d180fe4
(24 Dec
2006) and other related patches (fixed in upstream HEAD then, why was
the patch not brought across to the 1.3 branch?).
2007-03-04 16:00:52 +11:00
Eric Anholt
cd5fe7890d
Keep track of how many visuals we set up for GLcore, to avoid an invalid free.
...
The proper fix would involve actually setting up the ARGB visual for GLcore,
but I just want the server to not crash at exit.
2007-01-29 22:56:31 -08:00
Adam Jackson
c919f880d7
Bug #8991 : Add glXGetDrawableAttributes dispatch; fix texture format therein.
2007-01-22 22:12:27 -05:00
Michel Dänzer
cf70493520
__glXDRIscreenProbe: Use drmOpen/CloseOnce.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from
Alan Swanson.
(cherry picked from 65f4690ecb
commit)
2007-01-22 17:52:19 -05:00
Samuel Thibault
594d180fe4
remove last remaning 'linux'isms (bug #5613 )
...
Make sure we don't build non-Linux stuff in configure.ac, and test based
on userland, rather than kernel.
2006-12-24 06:31:05 +02:00
Brian
198560a081
added mipmap.c
2006-12-21 09:06:44 -07:00
George Sapountzis
782166ac22
Fix GL context destruction with AIGLX.
...
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
(cherry picked from f17e3c34df
commit)
2006-11-30 20:17:27 +02:00
Adam Jackson
216bccb00c
'make dist' fixes.
...
(cherry picked from 0409e1627a
commit)
2006-11-08 16:17:38 -05:00
Michel Dänzer
1ab7fe38df
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
...
(cherry picked from 3ad1642f1b
commit)
2006-10-21 13:30:14 +02:00
Ian Romanick
4702375764
Fix bug #8608 .
...
Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.
(cherry picked from a6df780e4d
commit)
2006-10-11 15:42:02 -07:00
Daniel Stone
4b5ca6b3df
symlink-mesa.sh: expand *.{c,h}
...
(cherry picked from d7c89c7c1c
commit)
2006-10-11 16:02:41 -04:00
Brian
4c7d76cbac
Replace hard-coded filesnames with loops (all .c and .h files).
...
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
(cherry picked from 84eb2c0a06
commit)
2006-10-11 16:02:24 -04:00
Jeff Smith
e95920b7d7
Bug #8449 : Yet another Mesa symlink script resync.
...
(cherry picked from cf6e9687ff
commit)
2006-10-11 16:02:09 -04:00
Adam Jackson
61f3eb816b
Back out merge of master to 1.2 branch. Undoes 89987ca...
...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
2006-10-11 15:56:45 -04:00
Daniel Stone
d7c89c7c1c
symlink-mesa.sh: expand *.{c,h}
2006-10-02 02:19:51 +03:00
Brian
84eb2c0a06
Replace hard-coded filesnames with loops (all .c and .h files).
...
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
2006-09-28 15:09:40 -06:00
Jeff Smith
cf6e9687ff
Bug #8449 : Yet another Mesa symlink script resync.
2006-09-28 15:34:17 -04:00
Ian Romanick
05231e336d
Use correct opcodes for GLX_EXT_texture_from_pixmap.
...
Regenerate from glX_API.xml 1.3 from Mesa. The glproto package and libGL
(from Mesa) must also be updated.
2006-09-14 14:13:39 -07:00
Kristian Høgsberg
86450998da
Fix AIGLX VT switching.
...
See https://bugs.freedesktop.org/show_bug.cgi?id=7916
There may be a simpler, less intrusive fix that involves just rearranging
DRI locking between 2D and 3D drivers around VT switch.
2006-09-07 15:35:16 -04:00
Ian Romanick
64479fffa2
Remove prototypes and externs for non-existant functions and variables.
2006-09-06 16:13:21 -07:00
Ian Romanick
a0179281a6
Remove prototypes for non-existant functions.
2006-09-06 15:45:48 -07:00
Ian Romanick
c2813514cf
Add missing file from previous commit.
2006-08-31 15:36:13 -07:00
Ian Romanick
0f9cfb2f75
Implement GLX_SGI_swap_control.
...
Regenerate from glX_API.xml 1.2. Add infrastructure to support
GLX_SGI_swap_control for AIGLX when the DRI driver enables it. Tested
with R300.
2006-08-31 13:54:10 -07:00
Ian Romanick
a9ef586291
Fix problems with vertex program protocol
...
There were two sets of bugs in the vertex program (ARB and NV)
protocol. First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation. Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004). For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.
This is just a server-side regeneration from gl_API.xml version 1.68.
2006-08-31 13:47:50 -07:00
Ian Romanick
2fb7b8795a
Minor extension tweaks.
...
GLX_EXT_texture_from_pixmap should always be enabled.
GLX_SGI_video_sync is only for direct rendering and should never
appear in the server's string.
2006-08-29 16:35:32 -07:00
Ian Romanick
d59b52fc08
Make sure unsupported extensions are disabled.
...
GLX protocol isn't supported for GLX_SGI_swap_control or
GLX_SGI_video_sync. Remove them from the list of available extensions
until they are supported.
2006-08-29 14:40:13 -07:00
Ian Romanick
db6d04d4b8
Add support for AIGLX drivers to enable GLX extensions that they support.
2006-08-29 14:35:08 -07:00
Ian Romanick
77d315bd2f
Remove __glXNoSuchRenderOpcode because it is no longer used.
2006-08-29 13:30:20 -07:00
Ian Romanick
2fde560bbb
Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
...
Re-generate from gl_API.xml 1.65. This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
2006-08-25 13:01:51 -07:00
Ian Romanick
e2d529963e
Enable vertex and fragment programs.
...
Implement glGetProgramStringARB and glGetProgramStringNV. With these
functions implemented, GL_ARB_{vertex,fragment}_program,
GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
2006-08-25 12:05:16 -07:00
Ian Romanick
c33e39c86b
Finish support for GL_ARB_texture_compression.
...
Fill in __glXDisp_GetCompressedTexImageARB and
__glXDispSwap_GetCompressedTexImageARB to finish support for
GL_ARB_texture_compression. With this extension (and the related
compression extensions), the server-side GLX supports all of the
protocol for GL 1.4. w00t!
The bad news is that this has received only minimal testing, and Mesa
does not contain any good tests for GL_ARB_texture_compression.
2006-08-24 20:33:57 -07:00
Ian Romanick
cd2da4e41e
Remove GL/glx/g_disptab.c, GL/glx/g_disptab_EXT.c, and
...
GL/glx/g_disptab_EXT.h. Unfortunately GL/glx/g_disptab.h has to be
kept around a bit longer.
2006-08-24 18:00:16 -07:00
Ian Romanick
a29e6dd2d2
Add some missing bits of GL_SGI_color_table.
2006-08-24 17:58:52 -07:00
Ian Romanick
2c865277fe
Regenerate from gl_API.xml 1.63. Enable extensions.
...
gl_API.xml 1.63 corrects some problems with GLX protocol for
GL_EXT_paletted_texture and GL_SGI_color_table. Regenerate from that
file, and enable those extensions and GL_EXT_shared_texture_palette.
2006-08-24 14:54:49 -07:00
Ian Romanick
7d5de5c665
Regenerate from gl_API.xml 1.62. Functions move, no real changes.
2006-08-24 14:49:46 -07:00
Lukáš Turek
b29b236d88
Adapt to Mesa header name change.
2006-08-24 15:57:09 +02:00
Alan Hourihane
67bd672c88
Fix typo
2006-08-24 08:47:06 +01:00
Ian Romanick
0623d3643f
Fix the sorting of the extension string. Add a few extensions that
...
are supported by the new code. A few of these were actually supported
before but weren't advertised.
2006-08-23 17:16:02 -07:00
Ian Romanick
5d2caacff5
Refector __glXDisp_Render and __glXDispSwap_Render to DoRender.
...
Refector __glXDisp_RenderLarge and __glXDispSwap_RenderLarge to
DoRenderLarge.
2006-08-23 16:47:00 -07:00
Ian Romanick
866bb3f340
Memo to myself: Whenever a Makefile.am changes, autogen.sh must be
...
re-run. This is especially true if the change is to remove a source
file.
Fix RenderLarge to actually use the new protocol decode tables.
2006-08-23 16:41:53 -07:00
Ian Romanick
f6fd7d8f83
Convert protocol decode tabels for Render and RenderLarge to use nice,
...
compact N-way search trees generated by scripts in Mesa.
2006-08-23 16:05:37 -07:00