cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
Makefile
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/gallium/Makefile
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 18:32:05 +01:00
47ad296a18
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 17:32:18 +01:00
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
2008-09-11 16:05:15 +01:00
8c092def6c
Remove CVS keywords.
...
Please remove CVS keywords when importing third-party code into the git
repository.
2008-08-31 17:43:20 +09:00
f56b569e9a
DRI2: Drop sarea, implement swap buffers in the X server.
2008-08-29 12:13:14 -04:00
0423a39239
version 20 of glxext.h
2008-08-11 15:21:40 -06:00
1a1079e066
version 41 of glext.h
2008-08-11 15:21:40 -06:00
7536f39622
version 41 of glext.h
2008-08-11 15:12:42 -06:00
d80d0bb4d6
version 20 of glxext.h
2008-08-11 15:12:42 -06:00
01ac4540f0
Apple: Some changes to fix compilation problems on OSX
2008-08-08 02:19:52 -07:00
b908ce93d4
egl: define vsnprintf
2008-08-06 16:42:38 -06:00
240962faf7
egl: added snprintf, strcasecmp defines
2008-08-05 19:20:43 -06:00
b51584184a
egl: typedef uint8_t for Windows
2008-08-05 08:12:38 -06:00
73c3c4d1cc
egl: typedef u_int32_t for Windows
2008-08-04 16:30:58 -06:00
e4f3770690
mesa: WinCE fixes
2008-07-16 16:11:38 -06:00
99233e483d
additional preprocessor checks for stdint.h, inttypes.h, etc
...
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
2008-07-15 17:30:51 -06:00
b7c54945fe
additional preprocessor checks for stdint.h, inttypes.h, etc
...
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
2008-07-15 17:21:56 -06:00
f4caddd66f
egl: updated GL_APIENTRY for Windows
2008-07-07 17:57:02 -06:00
810888f656
gles: Don't define GLAPIENTRY here.
2008-06-30 12:49:32 +09:00
0f9a1e43bc
egl: WinCE doesn't have sys/types.h
2008-06-28 20:40:44 +09:00
b028b0cc53
egl: Windows updates to the platform.h files
2008-06-27 07:13:58 -06:00
0b3d1b1ea4
mesa: WGL is not part of the WinCE API.
...
Although it would be interesting having the GDI winsys running on WinCE
several Windows GDI API functions and data structures are missing from
WinCE headers, making this far from a trivial endeavor.
2008-06-24 13:00:03 +09:00
543bba6ee3
mesa: Don't include sys/types.h on WinCE.
...
We probably shouldn't be including sys/types.h at all, but let's leave that
for another time.
2008-06-24 11:00:01 +09:00
6f7ed99b30
revert the DRI2 commits
2008-06-12 00:11:54 +01:00
5e9fe62c70
add missed files for DRI2 merge
2008-06-11 15:25:35 +01:00
4566b006f1
Bring in DRI2 changes
2008-06-11 14:10:08 +01:00
adaf0385e8
egl: updated EGLAPI for Windows
2008-06-06 15:13:59 -06:00
fe1a2d1fff
egl: assorted fixes for Windows
...
Note that int32_t is typedef'd both in p_compiler.h and eglplatform.h
2008-06-05 15:07:03 -06:00
1b386f4416
egl: new GLES/glplatform.h header
2008-06-04 10:27:22 -06:00
3783994048
egl: updated GLES/gl.h and GLES/glext.h headers from Khronos.org
2008-06-04 10:17:56 -06:00
0ebc94d236
egl: added OpenGL ES 2.0 header files in new GLES2 directory
2008-06-04 10:04:31 -06:00
df8f9a1690
egl: created GLES/egl.h backward-compatibility header (see comments inside)
2008-06-04 10:03:39 -06:00
493f3a0032
egl: moved egl.h into EGL/ directory
2008-06-04 10:01:16 -06:00
3e702fa881
egl: moved eglext.h into EGL/ directory
2008-06-04 10:00:32 -06:00
0d8676822d
remove old/unused foomesa.h example header
2008-06-04 09:33:02 -06:00
645c131264
Assorted Windows fixes (Karl Schultz)
2008-05-29 10:42:02 -06:00
c6426c97b9
obsolete with EGL 1.4
2008-05-27 13:45:01 -06:00
2fe1a55ab2
added EGL_MESA_screen_surface, EGL_MESA_copy_context extensions
2008-05-27 13:43:56 -06:00
57da567dc5
added typedefs for X/Mesa
2008-05-27 13:43:34 -06:00
0841f0a85e
remove stray ! character
2008-05-27 13:43:17 -06:00
704a5c7efb
new eglplatform.h from Khronos.org (replaces GLES/egltypes.h)
2008-05-27 13:43:01 -06:00
6438f6fdf7
new eglext.h from Khronos
2008-05-27 13:42:38 -06:00
d0f5d8c5a3
EGL 1.4 header from Khronos
2008-05-27 13:42:12 -06:00
77ce568ff7
Remove CVS keywords.
2008-05-26 20:14:40 +09:00
d4510e53d8
drop GLcore
2008-05-23 22:48:55 +03:00
280bf89bd4
Add DRI driver that uses the mesa swrast module.
2008-05-20 16:03:44 -04:00
deceeca18d
mesa: update/add newer GL ES headers
2008-05-07 08:47:55 -06:00
32a2a095f4
glcore: build from mesa
2008-04-23 11:12:30 +03:00
e82dd8c6e1
DRI interface changes and DRI2 direct rendering support.
...
Add DRI2 direct rendering support to libGL and add DRI2 client side
protocol code. Extend the GLX 1.3 create drawable functions in
glx_pbuffer.c to call into the DRI driver when possible.
Introduce __DRIconfig, opaque struct that represents a DRI driver
configuration. Get's rid of the open coded __GLcontextModes in the
DRI driver interface and the context modes create and destroy
functions that the loader was requires to provide. glcore.h is no
longer part of the DRI driver interface. The DRI config is GL binding
agnostic, that is, not specific to GLX, EGL or other bindings.
The core API is now also an extension, and the driver exports a list
of extensions as the symbol __driDriverExtensions, which the loader
must dlsym() for. The list of extension will always include the DRI
core extension, which allows creating and manipulating DRI screens,
drawables and contexts. The DRI legacy extension, when available,
provides alternative entry points for creating the DRI objects that
work with the XF86DRI infrastructure.
Change DRI2 client code to not use drm drawables or contexts. We
never used drm_drawable_t's and the only use for drm_context_t was as
a unique identifier when taking the lock. We now just allocate a
unique lock ID out of the DRILock sarea block. Once we get rid of the
lock entirely, we can drop this hack.
Change the interface between dri_util.c and the drivers, so that the
drivers now export the DriverAPI struct as driDriverAPI instead of the
InitScreen entry point. This lets us avoid dlsym()'ing for the DRI2
init screen function to see if DRI2 is supported by the driver.
2008-03-31 16:51:26 -04:00
4e6c2c4f85
updated to version 40
2008-03-25 08:12:19 -06:00
Keith Whitwell