Commit Graph

51 Commits

Author SHA1 Message Date
Jakob Bornecrantz 1fd411539b egl: eglinfo load i915 driver 2009-01-19 02:29:54 +01:00
Jakob Bornecrantz 94ddd621d1 egl: Make eglscreen sleep for five seconds 2009-01-18 13:40:24 +01:00
Jakob Bornecrantz b6b619c6ff egl: Add eglscreen to help debug egl mesa screen 2009-01-18 05:14:01 +01:00
Jakob Bornecrantz a5df724c52 egl: Make eglinfo print screen info 2009-01-17 20:50:00 +01:00
Alan Hourihane d142f216d2 link EGL demos with -lGL 2008-09-26 11:20:20 +01:00
Keith Whitwell a8d1521f30 Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	src/mesa/shader/slang/slang_link.c
2008-09-18 19:07:33 +01:00
Brian Paul 3b3d34d637 egl: print multisample info 2008-09-17 15:29:59 -06:00
Keith Whitwell 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
Alan Hourihane 5c9d0c7052 pick first mode 2008-08-17 21:59:00 +01:00
Alan Hourihane b6db08a91b choose a 1024x768 resolution 2008-08-17 19:13:17 +01:00
Jakob Bornecrantz 52912d8616 egl: Add egltri
First tri for EGL drivers with mesa screen ext
2008-07-04 19:33:09 +02:00
Jakob Bornecrantz 4e52fa9b91 git: Updated .gitignore files 2008-06-16 12:20:17 +02:00
Brian Paul 2154cb4994 egl: single triangle test 2008-06-04 11:41:37 -06:00
Brian Paul bf527cc8d4 egl: fix X visual selection 2008-06-04 11:40:25 -06:00
Brian Paul b9d35c7c44 egl: query/print EGL_NATIVE_VISUAL_ID
Other whitespace/etc clean-ups.
2008-06-04 11:36:59 -06:00
Jakob Bornecrantz 88f86c9d02 egl: Added peglgears, gears that uses pbuffers 2008-06-04 19:31:05 +02:00
Brian Paul af540ef369 egl: updated egl.h include paths 2008-06-04 10:11:25 -06:00
Brian Paul 6b9b49127e egl: bind the OpenGL API 2008-05-30 13:46:50 -06:00
Brian Paul 80ed996803 egl: new version of gears demo that uses Xlib+EGL (and full OpenGL for now) 2008-05-30 11:47:09 -06:00
Brian Paul 8cd33faee6 egl: query/print EGL_CLIENT_APIS 2008-05-28 15:25:01 -06:00
Jakob Bornecrantz 3e867959e9 egl: Fix warning in eglgears 2008-05-28 11:17:14 +02:00
Jakob Bornecrantz d8a693ee49 egl: Make demo3 compile 2008-05-28 11:17:10 +02:00
Brian Paul a6af2e3345 include eglext.h, define EGL_EGLEXT_PROTOTYPES 2008-05-27 13:47:23 -06:00
Brian Paul 096b79bf17 updates for EGL 1.4 2008-05-27 13:47:07 -06:00
Jakob Bornecrantz a3dbd412df Merge branch 'gallium-i915-current' into gallium-0.1 2008-05-23 16:26:14 +02:00
Dan Nicholson 0a4867bd4c Ignore more generated files in progs/
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2008-05-20 19:04:57 -04:00
Jakob Bornecrantz 3f9de6ff7d egl: Updated EGL samples to use new i915 EGL winsys 2008-05-14 17:20:25 +02:00
Dan Nicholson 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
Dan Nicholson b182613f2f Ignore more generated files in progs/
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2007-10-10 08:44:58 -06:00
Dan Nicholson 2a3e33865d add support for LDFLAGS env var 2007-09-28 18:42:21 -06:00
Brian Paul 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
Dave Airlie 1b6a081885 update to new API 2005-12-23 08:42:29 +00:00
Brian Paul 790ab0a0b6 s/eglShowSurfaceMESA/eglShowScreenSurfaceMESA/ 2005-12-10 17:59:36 +00:00
Brian Paul 023c95481b check/print EGL_SCREEN_BIT_MESA, fix eglGetDisplay() call 2005-11-23 01:45:25 +00:00
Brian Paul 957b517c4f Choose the display mode / surface size in an intelligent way.
Fix // comments.
More error checking, etc.
2005-11-23 01:44:38 +00:00
Dave Airlie 298af7a609 fix up libdrm for egl 2005-08-21 03:17:52 +00:00
Ian Romanick aba4864a25 Make the linux-dri-x86 builds work on x86-64 again. mklib now
determines the bits (either 32 or 64) for libraries without the lib
prefix.  progs/egl/Makefile passes CFLAGS on the link commands so that
things like '-m32' get propagated.
2005-08-08 23:22:46 +00:00
Jon Smirl 9a4dbf1cff Fix up some of the sample to work with the r200 EGL driver 2005-08-07 02:15:27 +00:00
Brian Paul badad72383 eglgears demo (Dane Rushton) 2005-07-14 23:16:41 +00:00
Jon Smirl 6c2098ffd4 Fix a few compiler warnings 2005-06-16 04:25:45 +00:00
Brian Paul e3e8067db7 use MAX_SCREENS instead of hard-coded number 2005-05-20 14:11:11 +00:00
Brian Paul 8f384f0b67 fix reversed strstr() args, print mode string 2005-05-20 14:03:35 +00:00
Brian Paul e58d32947e replace // with /* */ 2005-05-20 14:02:02 +00:00
Jon Smirl c70dace694 Fix EGL fbdev palette problem. demo3 can save ppm of screen 2005-05-19 15:03:31 +00:00
Jon Smirl 9a1b5af333 Fix inverted y for egl fbdev, add egl demo3 2005-05-18 20:44:23 +00:00
Jon Smirl 9a3da7ea7b Implement fbdev swapbuffers() 2005-05-18 01:44:11 +00:00
Jon Smirl d06da50888 Fix several internal problems with generating the list of configs. 2005-05-17 00:59:13 +00:00
Jon Smirl aecc05627a Add forgotten demo2.c
VS: ----------------------------------------------------------------------
2005-05-14 03:51:18 +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
Brian Paul 3aeae20685 updates for latest EGLScreenMESA changes 2005-05-04 03:32:39 +00:00