Commit Graph

455 Commits

Author SHA1 Message Date
Brian Paul 8ea3353ec3 XMesaDrawLine macro, not currently used 2006-03-30 14:20:26 +00:00
Karl Schultz a8c9ecfab0 Fixes from Brian 2006-03-30 07:53:15 +00:00
Brian Paul 4cbd16ed3f fix some PFNGL* typedefs 2006-03-26 05:09:03 +00:00
Brian Paul 9c32af5bb2 Add prototypes for GLX_MESA_swap_frame_usage, GLX_MESA_swap_control, and
GLX_EXT_texture_from_pixmap to silence warnings while compiling glxcmds.c
XXX: Need to add the new tokens for GLX_EXT_texture_from_pixmap!!!
2006-03-09 16:27:35 +00:00
Brian Paul a231097609 GL_EXT_framebuffer_blit tokens/functions 2006-03-01 01:54:59 +00:00
Brian Paul 44a2e96729 include inttypes.h if __osf__ defined (Randall Hand) 2006-02-23 15:36:39 +00:00
Brian Paul 640ef7f890 EGL 1.2 tokens/functions/etc. 2006-02-05 16:39:19 +00:00
Brian Paul f3cf636e57 WGL_ARB_extensions_string extension 2006-01-25 17:33:13 +00:00
Brian Paul b6d7a0c5a5 regenerate to pick up glGetQueryObject[u]i64vEXT funcs 2005-12-14 14:23:37 +00:00
Brian Paul 215aa20f5c rename eglShowSurfaceMESA, add EGL_SCREEN_POSITION_GRANULARITY_MESA 2005-12-10 17:54:36 +00:00
Brian Paul 5abc246f8d bump version number 2005-12-08 14:51:36 +00:00
Brian Paul 5262c225ba remove stray _ from GL[u]int64_EXT 2005-12-08 14:10:59 +00:00
Karl Schultz 4c3443b460 handle 64-bit types for Windows. 2005-12-08 04:32:02 +00:00
Brian Paul 0fa8c59e64 Updates for GL_EXT_timer_query:
New GLint64EXT and GLuint64EXT types (use C99's long long types).
New glGetQueryObject[u]i64vEXT() functions.
2005-12-07 14:48:19 +00:00
Brian Paul 96f216565e assorted fixes for server-side direct rendering (bug 5199) 2005-11-29 23:01:43 +00:00
Brian Paul ba3da6154c Added OSMesaColorClamp(), bug 4917 2005-11-12 18:44:29 +00:00
Brian Paul 3e9c099088 remove a bunch of extension stuff that's in glxext.h 2005-11-08 14:44:07 +00:00
Brian Paul 1b5d3d647e added GL_EXT_packed_depth_stencil 2005-09-28 02:28:00 +00:00
Brian Paul 2eef2eca87 Silence some warnings. 2005-09-11 01:45:04 +00:00
Karl Schultz f66084b834 Add support for memory contexts (Thomas Kaltofen). Cleanup compilation warnings. 2005-09-05 14:48:39 +00:00
Brian Paul c799e9ec24 added GL_EXT_timer_query token 2005-09-02 13:43:26 +00:00
Brian Paul 160b3284dd include stdint.h if WIN32 and GNUC (Colin Harrison). Patch forwarded to SGI. 2005-08-15 23:25:33 +00:00
Ian Romanick 68679d2b9e Remove '#if 0' block that was accidentally left in. 2005-07-28 20:55:26 +00:00
Ian Romanick 1585c234e0 Major rip-up of internal function insertion interface. The old
_glapi_add_entrypoint has been replaced by a new routine called
_glapi_add_dispatch.  This new routine dynamically assignes dispatch offsets
to functions added.  This allows IHVs to add support for extension functions
that do not have assigned dispatch offsets.

It also means that a driver has no idea what offset will be assigned to a
function.  The vast majority of the changes in this commit account for that.
An additional table, driDispatchRemapTable, is added.  Functions not in the
Linux OpenGL ABI (i.e., anything not in GL 1.2 + ARB_multitexture) has a
fixed offset in this new table.  The entry in this table specifies the
offset in of the function in the real dispatch table.

The internal interface was also bumped from version 20050725 to 20050727.

This has been tested with various programs in progs/demos on:

radeon (Radeon Mobility M6)
r128 (Rage 128 Pro)
mga (G400)
2005-07-28 00:29:51 +00:00
Ian Romanick 9f23a3a1bf Fix SPARC assembly for 64-bit
- The test for whether or not we're building for 64-bit is '#ifdef __arch64__'.
 This appears to be correct on both Linux and Solaris.

- The test for Solaris is now '#if defined(SVR4) || defined(__SVR4) ||
defined(__svr4__)'.  GCC 3.4.0 has all three defined on Solaris 9.

- Enables assembly language clip routines.

- Fixes to make GLSL code build on Solaris.

- Update gl_SPARC_asm.py.
2005-07-28 00:11:10 +00:00
Ian Romanick 5c6fd3dd4c No, really, get rid of all the remaining references to DRI_USE_NEW_INTERFACE.
A couple other remnants of the old interfaces hit the dust too.  Thanks
Jon. :)
2005-07-26 05:57:24 +00:00
Ian Romanick 5f1ba3e21b Fixes the glXGetProcAddress portion of the interface. Most of the functions
that are currently obtained via glXGetProcAddress and all of the XF86DRI
functions are replaced with a funciton table.  This table will be passed to
__driCreateNewScreen.

One of the functions in the table is getProcAddress.  This allows some
loaders to expose functionality not in all loaders.  This will be immediatly
used for glxEnableExtension (formerly known to drivers as
__glXScrEnableExtension).  libGL (and in the future libglx) expose this
function so that drivers can enable GLX extensions.  libEGL should exposed
eglEnableExtension to enable EGL extensions.  The same function cannot be
used for both because the extensions have different names and (possibly)
different semantics.  Drivers can optionally use one, both, or neither.

The key parts are in the __DRIinterfaceMethodsRec structure in
dri_interface.h.  A pointer to one of these structures is passed into
__driCreateNewScreen.  Because of this, the version of the API is bumped to
20050725.  Since the previous version(s) were never in a release, their
existance is erased.

I was actually a little surprised by how much code this cuts from the
drivers.  A lot of glXGetProcAddress calls disappear, and a lot of
version checks go with them.  Nice.

The one thing I'm not sure of is removing __glXInitialize.  For some
reason that function was in the glXGetProcAddress table, but *nothing*
in the Mesa tree used it.  Did something with DRI conf. use this
function?  It seems odd...
2005-07-26 02:44:01 +00:00
Ian Romanick e9dbe58b8b Gut a few more dead bits. Replace uses of the CreateNewScreenFunc typedef
(from glxclient.h) with PFNCREATENEWSCREEN (from dri_interface.h).

Remove the prototype for __driCreateScreen and fix the prototype for
__driCreateNewScreen (append the API version) in dri_interface.h.
2005-07-24 07:38:23 +00:00
Ian Romanick c39bf5e273 All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allows
1,402 lines of code to be removed from Mesa (drivers and libGL).  The
big winner is dri_util.c.

Primary changes are:

1. Remove all "deprecated" entry-points from the various structures in
dri_interface.h.

2. Rename the remaining fields to removed "version numbers."  So,
bindContext3 becomes bindContext.  Functions with "New" in the name
(e.g., CreateNewContext) were *not* changed, but that is an option.
Having "New" in the name is less annoying to me than having "3" in the name.

3. Remove all compatibility code that handles cases where the driver or
the loader is too old to support the latest interfaces.

4. Append the API version to the __driCreateNewScreen function name.
This is currently done by hand.  In the future (i.e., the next time we
make an incompatible change to the interface) we'll want to come up with
a better way to do this.  This prevents old loaders from being able to load
new (incompatible) drivers.

5. Bump the API version to 20050722.  All drivers (by way of dri_util.c)
require this version.

6. All drivers are *required* to expose GLX_SGIX_fbconfig and
GLX_OML_swap_method (or the moral equivalents).  Support for these
functions in implicit in the use of the "new" interface.

7. Some cases still exist that need to be compiled differently in a loader
or core Mesa versus in a driver.  These are identified by the define
IN_DRI_DRIVER.
2005-07-24 06:29:14 +00:00
Brian Paul 23606a5704 updated to version 29 2005-06-21 14:30:46 +00:00
Brian Paul ee7ad16f3f regenerated 2005-06-08 13:35:28 +00:00
Brian Paul 2c7336af4e put full prototype on one line to fix gl_mangle.h generation (Dave Reveman) 2005-06-08 13:35:07 +00:00
Brian Paul 012de39c23 remove stray line 2005-06-08 13:07:33 +00:00
Brian Paul d45cb9a836 regenerate for latest glext.h 2005-06-08 02:18:22 +00:00
Brian Paul 5d5100aabc remove temporary GL_EXT_framebuffer_object info 2005-05-31 23:54:44 +00:00
Brian Paul 2e081cd90e updated to version 28 2005-05-31 23:54:24 +00:00
Brian Paul 198d6d05b0 remove eglQueryDisplayMESA() 2005-05-17 13:22:13 +00:00
Brian Paul 72a313902b EGL_MESA_copy_context stuff 2005-05-16 02:21:57 +00:00
Jon Smirl 1c606a9aa1 Add empty placeholder for eglCopyContextMESA 2005-05-14 14:54:38 +00:00
Jon Smirl 8110df4f61 Fix compiler warning about missing parameter list 2005-05-14 14:11:11 +00:00
Jon Smirl 7012d01d88 First attempt at getting egl support up on dumb framebuffer.
Seems to be mostly working. Not all of egl API is implemented.
2005-05-13 18:31:35 +00:00
Karl Schultz db21f1c84f The "P" suffix on APIENTRY and GLAPIENTRY is to be used for pointers to
functions, not for functions that return pointers.  Restore protoype
for glGetString back to its correct form.
2005-05-11 22:01:20 +00:00
Brian Paul e4b2356c07 Major check-in of changes for GL_EXT_framebuffer_object extension.
Main driver impacts:
- new code for creating the Mesa GLframebuffer
- new span/pixel read/write code
Some drivers not yet updated/tested.
2005-05-04 20:11:35 +00:00
Brian Paul fe6ee3f5e6 EGLScreenMESA updates 2005-05-04 20:00:15 +00:00
Brian Paul 20d44dc9bc types for Mesa implementation of EGL 2005-04-22 21:16:28 +00:00
Brian Paul 11b0a76370 prototype EGL_MESA_screen_surface. 2005-04-22 21:16:12 +00:00
Adam Jackson 8ff72e9723 Add preliminary EGL headers. 2005-03-04 20:18:55 +00:00
Dave Airlie 9bfd9582d4 bring over structs from Xorg glx.h to make Mesa glx.h the one true glx.h 2005-02-26 03:55:44 +00:00
Dave Airlie 24dcc6b6bf Add GLX_MESA_allocate_memory from Xorg glx.h 2005-02-26 03:51:17 +00:00
Dave Airlie dee1c795c2 add more functionality to miniglx for glitz 2005-02-20 10:46:34 +00:00
Brian Paul f321f16e83 fix non-Win32 definition of GLUTAPIENTRY, remove some cruft 2005-02-16 19:52:35 +00:00
Dave Airlie 09298228c6 add EnableExtension so r200 enables all its extensions, add mesa memory
extension entry points
2005-02-15 08:40:24 +00:00
Adam Jackson d084982240 Bug #2477: Make GLU/GLw/glut build properly even with -fvisibility=hidden. 2005-02-08 05:46:53 +00:00
Brian Paul cf69e051ce added GL_EXT_framebuffer_object enums/funcs. Remove when glext.h is updated 2005-02-08 03:45:08 +00:00
Ian Romanick 5b0dd89370 remove a bunch of temporary #defines, now that glext.h was updated 2005-01-26 19:19:06 +00:00
Brian Paul 1060211918 fix glGetString funniness 2005-01-21 16:35:56 +00:00
Brian Paul 14dee36fa7 glext.h version 26 2005-01-20 15:07:42 +00:00
Brian Paul 5255044c00 added a few OpenGL 2.0 tokens (temporary) 2005-01-16 19:40:15 +00:00
Brian Paul d7b837ad4a temporary prototypes for OpenGL 2.0 2005-01-12 04:06:55 +00:00
Brian Paul 85edffd5ff added GLX_NV_float_buffer 2005-01-04 14:48:14 +00:00
Brian Paul 81ca616e7e DirectFB driver (Claudio Ciccani) 2005-01-03 15:35:00 +00:00
Brian Paul 538541e300 VMS update 2004-12-17 14:48:00 +00:00
Daniel Borca 8b563fd4c5 added DMesaProc type to prevent gcc 3.4.3 warnings 2004-12-15 07:55:38 +00:00
Alan Hourihane 38b317d508 uint*t -> u_int*t changes 2004-12-14 09:11:52 +00:00
Alan Hourihane 8635615501 Check for some header defines before redefining functions. Silences warnings. 2004-12-08 12:59:15 +00:00
Brian Paul bf4c23d00f no need to include stddef.h anymore 2004-11-29 17:31:03 +00:00
Brian Paul 4d880987d2 Have OSMesaGetProcAddress() return new OSMESAproc typedef. 2004-11-27 16:24:39 +00:00
Brian Paul 2dd5b9edaa typedef GLUTproc, return it from glutGetProcAddress() 2004-11-27 04:54:48 +00:00
Brian Paul b653aaede5 minor APIENTRY clean-ups 2004-11-25 23:20:07 +00:00
Brian Paul 83889ffd97 Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW).  (Gregor Anich)
2004-11-08 15:08:48 +00:00
Adam Jackson bcd8735546 Import sarea.h from Xorg, needed for client GLX code. 2004-10-25 20:52:11 +00:00
Ian Romanick 33899b7c35 Add support for OES_read_format. As soon as glext.h is updated with the
enums for this extension, the changes to gl.h can be removed.
2004-10-16 01:16:54 +00:00
Daniel Borca 65a9ca3381 bump version numbers to their real values 2004-10-12 06:43:57 +00:00
Brian Paul 788ff5b5c7 remove unused413 stuff, glDrawBuffersARB uses that slot now 2004-10-02 22:47:48 +00:00
Brian Paul be91a0be58 version bump 2004-09-27 22:40:31 +00:00
Brian Paul 4f1e3709de change include of glx_mangle.h to match other headers 2004-09-27 22:40:22 +00:00
Brian Paul d86d1483ac Another attempt at fixing name mangling and gl__unused413(). 2004-09-09 18:13:35 +00:00
Brian Paul a6c423d956 Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696) 2004-08-25 15:59:48 +00:00
Philippe Houdoin ac07d89fd3 Stupid me. I don't know why I moved the GLView.h here at first, but now I know why
I shouldn't:
Official BeOS GLView.h defines a virtual ErrorCallback(GLenum) method, assuming
a unsigned long GLenum.
But under Mesa, GLenum is unsigned int.
To keep binary compatibility, BeOS apps including Mesa GL/gl.h MUST include *our*
GLView.h, or linker will report a missing ErrorCallback(unsigned int) symbol. Glup.
2004-08-16 08:39:36 +00:00
Brian Paul 6ade8a36b6 version 6 from oss.sgi.com 2004-07-28 13:23:11 +00:00
Brian Paul 196fb036d6 version 24 from oss.sgi.com 2004-07-28 13:22:46 +00:00
Jon Smirl c2bffec91a Mesa-solo builds with these changes. There are still more fixups needed to
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
2004-06-26 17:16:42 +00:00
Brian Paul e4fbcd0fca updated to version 23 2004-06-23 14:48:04 +00:00
Brian Paul 6b869d4fe1 Alexander Gottwald's patch for cygwin 2004-06-22 17:16:02 +00:00
Ian Romanick e1a7f31c2b Remove the rest of the need for glxclient.h and remove it from the tree. 2004-06-06 02:20:20 +00:00
Jon Smirl ba3d643c49 kill __driRegisterExtensions(), none of the functions did anything 2004-06-03 01:56:07 +00:00
Ian Romanick 749e842953 Replace Bool with GLboolean. 2004-06-02 20:46:03 +00:00
Ian Romanick 318aa84099 XF86DRIDestroyContext, XF86DRICreateDrawable, and
XF86DRIDestroyDrawable are all called directly from DRI drivers using
the new interface.  Therefore, prototypes, using available datatypes,
must be available in dri_interface.h.  Since the prototypes are
available there, xf86dri.h is no longer needed for
DRI_NEW_INTERFACE_ONLY builds.
2004-06-02 17:37:09 +00:00
Ian Romanick 60b0e12830 Convert 'Display *' to '__DRInativeDisplay *'. Only portions of the
interface that are not *strictly* part of the old interface were
changed.  Replace GetDrawableInfo type (dri_util.h) with
PFNGLXGETDRAWABLEINFOPROC (dri_interface.h).  Wrap __driCreateScreen
(in drivers that use the new interface) with '#ifndef
DRI_NEW_INTERFACE_ONLY'.
2004-06-01 20:24:59 +00:00
Ian Romanick fabe2b9ba3 Replace all occurances of XF86DRIClipRect (and related typedefs) with
drm_clip_rect_t.
2004-06-01 16:38:56 +00:00
Brian Paul 27eb8fa35a remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value 2004-05-21 15:51:13 +00:00
Keith Whitwell 74d563cdfb Allow *_dri.so to build in Mesa tree with the 'linux-dri' target. 2004-04-29 12:23:39 +00:00
Brian Paul 199972cef0 move #define for GL_DOUBLE, to put enums in right order 2004-04-23 18:00:00 +00:00
Ian Romanick ab37fddbfd Correct the comments about when the bindContext3 / unbindContext3
interface was added.
2004-04-15 01:24:57 +00:00
Brian Paul 5eb921382f added extern "C" for C++ (bug 930933) 2004-04-09 17:18:22 +00:00
Brian Paul fda7215db3 rename class to c_class if using C++ (bug 922294) 2004-03-24 15:59:44 +00:00
Brian Paul 192c988c73 new DRI interface header 2004-03-22 23:31:29 +00:00
Brian Paul ff6031c209 remove some unneeded macros 2004-03-04 16:20:38 +00:00
Brian Paul 0adce8f7c7 upgraded to version 22 2004-02-24 03:01:27 +00:00
Ian Romanick 304d3aa9cb Refactored several variables out of XMesaVisual in favor of identical
fields in __GLcontextModes (the base type).  Removed the need to keep
the XMesaVisualInfo pointer when building inside the X-server.
2004-02-19 00:57:04 +00:00