912488a8d0
egl_dri/egl_xdri: Makefiles should use pkg-config to find libdrm.
2008-09-11 11:43:56 -06:00
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
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
102529cf1b
egl: CreatePbufferSurface, Bind/ReleaseTexImage functions
2008-09-01 13:10:53 -06:00
c5f0fd95a4
egl: free display ext data in xdri_eglTerminate().
2008-08-27 16:20:19 -06:00
a88de345cd
egl: don't put the example/demo driver in the lib/ dir
2008-08-18 16:12:39 -06:00
26df49cd7a
egl: set EGL_SAMPLES, EGL_SAMPLE_BUFFERS config attribs
2008-07-16 10:35:12 -06:00
e7fd3de927
egl: set EGL_CONFORMANT, EGL_RENDERABLE_TYPE config fields, fix null ptr crashes in MakeCurrent
2008-07-14 12:09:07 -06:00
e59086ab91
EGL: Only build EGL dri based drivers under linux-dri based configs
2008-07-13 18:05:20 +02:00
3b8081603b
Always pass -linker and -ldflags to mklib for shared libraries
...
This just makes the use of mklib more consistent throughout Mesa where
we always want to pass the linker and LDFLAGS when we might be making a
shared library.
2008-07-12 10:25:40 -07:00
db072baaaf
Call mklib with $(SHELL) so the user controls the interpreter
...
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
2008-07-12 10:25:40 -07:00
80b24166a5
egl: a minor overhauld of egl_xdri.c
...
Rely more on the libGL code to avoid duplicated efforts. Also fix confusion
arising from multiple __DRIscreen objects.
2008-07-11 15:45:03 -06:00
7986baf7cf
build egl subdirs
2008-07-11 15:45:03 -06:00
b101890c15
egl: add all EGL_*_BITs to ClientAPIsMask
2008-07-10 13:29:42 -06:00
fb3867aec0
egl: implement xdri_eglGetProcAddress() for gallium
...
Plus comments, clean-ups.
2008-07-10 10:48:28 -06:00
e3b13dba4d
egl: link libEGL w/ additional libs
2008-07-09 15:49:59 -06:00
70b0a949b0
egl: misc updates/fixes
...
Set surface size when created.
Implement dri_find_dri_screen().
Look for "egl_xxx_dri.so" library before regular DRI driver.
2008-07-09 15:47:27 -06:00
28f3d390dd
egl: Fix demodriver
2008-07-03 12:10:36 +02:00
a1fb565ea7
egl: These changes allow an eglBindAPI(EGL_OPENGL_ES_API) to succeed, and to work correctly with GLES1 and GLES2.
...
- egl_xdri.c just sets the EGL_OPENGL_ES_BIT as well as the
EGL_OPENGL_BIT in ClientAPIsMask
- eglconfig.c allows the renderable type to include EGL_OPENGL_ES2_BIT
as well as EGL_OPENGL_ES_BIT.
- egl_xlib.c sets the EGL_NATIVE_RENDERABLE attribute to EGL_FALSE for
all softpipe configurations. (Otherwise, an eglChooseConfig() that
looks for particular values of EGL_NATIVE_RENDERABLE will fail.)
2008-06-27 07:17:02 -06:00
be16f04e76
egl: added a debug msg
2008-06-13 13:58:08 -06:00
e9b6ed395a
egl: only windows are renderable at this time
2008-06-10 16:14:35 -06:00
f374734d61
egl: improved Makefile
2008-06-06 15:59:54 -06:00
8dafe470fc
egl: EGL->DRI adaptor/driver
...
Allows regular DRI drivers to work with libEGL.
2008-06-06 15:52:47 -06:00
d5cf57de2d
egl: new src/egl/drivers/Makefile
2008-06-05 14:11:39 -06:00
f6bb2f87b9
egl: minor tweaks
2008-06-05 12:01:33 -06:00
31e70fa275
comments in _eglMain()
2008-05-29 17:04:24 -06:00
aa6e350bed
egl: pass args to _eglOpenDriver()
2008-05-28 13:03:59 -06:00
0c8908c411
egl: added args string to _eglMain()
2008-05-28 12:56:36 -06:00
17ec3b3cc5
prototype new code to map card number to driver name
2008-05-28 11:45:50 -06:00
aa4ca9119d
link libEGLdri.so with libdrm
2008-05-28 11:44:47 -06:00
68ff873c20
egl: Make dri driver compile
2008-05-28 10:55:26 +01:00
003afbe5bd
egl: Make demo driver compile
2008-05-28 10:55:26 +01:00
96a40345bb
include eglconfigutil.h
2008-05-27 16:58:23 -06:00
07e92b1742
misc updates, clean-ups, remove dependency on mtypes.h
2008-05-27 16:49:11 -06:00
fcce6c068c
s/GLuint/unsigned/
2008-05-27 13:47:44 -06:00
a6464b3cb0
Never fail `make clean'
...
Mostly some pedantic changes such that `make clean' always ignores
errors. Also changed the top clean target to do the `touch
configs/current' dance instead of realclean.
2008-05-07 11:35:23 -07:00
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
90ee7a4144
Gutsy oopses on touch of existing file. Workaround.
2007-08-07 10:18:30 +01:00
883f9891cb
LIB_DIR is now just 'lib' or 'lib64'
...
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
3696f0ee1d
updates for using libdrm (Hanno Bock)
2006-06-03 15:17:07 +00:00
fb83a42d31
fixup stamp so driver updates drawable info
2005-12-30 10:12:26 +00:00
edf570da67
use card_type not isPCI
2005-12-29 00:30:53 +00:00
f06ce1ba71
Rename eglDRIShowSurfaceMESA.
...
s/_eglAddMode/_eglAddNewMode/
2005-12-10 17:56:00 +00:00
98d9bb66a4
updates to match other changes elsewhere
2005-12-10 17:55:15 +00:00
5285c32a17
Put extension flags, string into separate struct.
2005-11-29 04:43:37 +00:00
f576450cae
clean up the drmGetMap/drmMap code
2005-11-29 04:18:38 +00:00
4683e8e954
apparently need to load colormap after setting the mode to make it work reliably
2005-11-29 03:00:02 +00:00
3070a581fc
Lots of fixes, clean-ups, new comments, etc.
...
To set the FBdev video mode, need to add a \n char to the string.
2005-11-28 00:00:08 +00:00
1ac1c1c423
use _egl_api struct, make some functions static
2005-11-24 04:05:27 +00:00
bf54a28384
Add missing egldri.h header file
2005-08-07 02:30:32 +00:00
485528f2ac
More EGL prep. No impact on anything outside of EGL
2005-08-05 03:33:59 +00:00
b507bd4160
New files for radeon egl driver.
...
Still a work in progress.
2005-08-04 22:23:34 +00:00
5a0cb726d1
fix pbuffer sample code
2005-05-17 13:21:46 +00:00
bb2c65200c
updated demoCreatePbufferSurface()
2005-05-17 02:15:38 +00:00
d9789b7861
s/Atrib/Attrib/, set extension enable flags
2005-05-16 02:16:33 +00:00
d0ddf190aa
Fix compile error in demo egl driver
2005-05-14 03:49:55 +00:00
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
c22990c29a
sync with latest EGL_MESA_screen_surface spec (EGLScreenMESA handles)
2005-05-04 03:33:21 +00:00
adbff7e977
initial EGL code
2005-04-22 21:09:39 +00:00
Dima Zavin
Keith Whitwell
Brian Paul
Jakob Bornecrantz
Dan Nicholson
Jakob Bornecrantz
Robert Ellison
Dave Airlie
Jon Smirl