Brian Paul
3d07060ae3
mesa: remove PROGRAM_DIRS from config files
2010-06-04 17:47:53 -06:00
Chia-I Wu
fbfecda6ae
progs/egl: Add egl/eglut to PROGRAM_DIRS.
...
Make sure eglut is built before the demos. This should work more
reliably with make -j<N>.
2010-04-27 14:19:24 +08:00
Chia-I Wu
c727ef0108
progs/egl: Move demos a level deeper.
...
Move the demos to "opengl" subdirectory.
2010-04-01 22:25:48 +08:00
Jakob Bornecrantz
c9f98673c5
gallium: Reorg winsys directories
...
Attached output from commit.
delete mode 100644 src/gallium/winsys/drm/SConscript
delete mode 100644 src/gallium/winsys/drm/i965/SConscript
delete mode 100644 src/gallium/winsys/drm/intel/Makefile
delete mode 100644 src/gallium/winsys/drm/intel/SConscript
delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/Makefile
delete mode 100644 src/gallium/winsys/drm/radeon/SConscript
delete mode 100644 src/gallium/winsys/drm/vmware/Makefile
delete mode 100644 src/gallium/winsys/drm/vmware/SConscript
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%)
rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%)
rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%)
rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%)
rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%)
rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%)
rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%)
rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%)
copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%)
rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%)
rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/null/Makefile (78%)
rename src/gallium/winsys/{ => sw}/null/SConscript (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%)
rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%)
rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%)
rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%)
rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%)
rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
f5ba2cdeb9
gallium: Move egl drivers to targets
...
Atteched output from git commit:
rename src/gallium/{winsys/drm => targets}/Makefile.egl (100%)
rename src/gallium/{winsys/drm/intel/egl => targets/egl-i915}/Makefile (86%)
rename src/gallium/{winsys/drm/i965/egl => targets/egl-i915}/dummy.c (100%)
rename src/gallium/{winsys/drm/i965/egl => targets/egl-i965}/Makefile (86%)
rename src/gallium/{winsys/drm/intel/egl => targets/egl-i965}/dummy.c (100%)
rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/Makefile (88%)
rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/dummy.c (100%)
rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/Makefile (87%)
rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/dummy.c (100%)
create mode 100644 src/gallium/targets/egl-swrast/Makefile
create mode 100644 src/gallium/targets/egl-swrast/swrast_glue.c
rename src/gallium/{winsys/drm/vmware/egl => targets/egl-vmwgfx}/Makefile (86%)
rename src/gallium/{winsys/drm/swrast/egl => targets/egl-vmwgfx}/dummy.c (100%)
delete mode 100644 src/gallium/winsys/drm/swrast/Makefile
delete mode 100644 src/gallium/winsys/drm/swrast/core/Makefile
delete mode 100644 src/gallium/winsys/drm/swrast/core/swrast_drm_api.c
delete mode 100644 src/gallium/winsys/drm/swrast/egl/Makefile
delete mode 100644 src/gallium/winsys/drm/vmware/egl/dummy.c
2010-03-24 17:02:17 +01:00
Jakob Bornecrantz
41d2ebf202
gallium: Remove GALLIUM_WINSYS_DRM_DIRS
2010-03-24 17:02:17 +01:00
Keith Whitwell
51bff09f72
mesa: fix linux-dri and autogen builds since sw-api-2 merge
2010-03-12 09:05:59 +00:00
Keith Whitwell
0c96690a5b
Merge commit 'origin/master' into gallium-sw-api-2
...
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_winsys.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c
2010-03-09 11:02:37 +00:00
Keith Whitwell
99f11d0e18
gallium: introduce target directory
...
Currently there are still at least two functions bundled up inside the
winsys concept:
a) that of a backend resource manager, sometimes capable of performing
present() operations,
b) the initialization code/routine for the whole driver stack.
The inclusion of (b) makes it difficult to share implementations of
(a) between different drivers. For instance, a clean xlib winsys
could be of use for software-rasterized VG, GLES, EGL, etc, stacks.
But that is only true as long as there is no dependency from the
winsys to higher level code, as would be the case when we include (b)
in this component.
This change creates a new gallium/targets subtree, specifically for
implementing the glue needed to build individual driver stacks, and
moves that code out of a single example winsys, namely xlib.
Other drivers continue to build unchanged, but hopefully can migrate
to this structure over time.
2010-03-08 19:11:35 +00:00
George Sapountzis
9009a854d1
config: drop WINDOW_SYSTEM var
2010-03-06 06:44:36 +02:00
Vinson Lee
e5d0956ca4
Remove ffb and gamma from configs.
2010-03-03 19:03:45 -08:00
Kristian Høgsberg
6e8897ff9f
Retire miniglx and move the actual glx code up to src/glx
2010-02-09 09:58:36 -05:00
Chia-I Wu
3c967a9207
st/egl_g3d: Rename to st/egl.
...
Simply the name to egl.
2010-01-22 16:45:28 +08:00
Chia-I Wu
52d7b2cede
st/egl: Remove the egl state tracker.
...
The egl_g3d state tracker has support for KMS, and the support is based
on the egl state tracker. As egl_g3d provides more features, it should
be better to keep only egl_g3d to unify the efforts.
2010-01-22 15:37:56 +08:00
Chia-I Wu
324fdf7364
egl: Remove the demo driver.
...
The demo driver has outdated. It is suggested to look at any of the
drivers that is functioning.
2010-01-22 15:10:09 +08:00
Brian Paul
251363e8f1
configs: set INTEL_LIBS, INTEL_CFLAGS, etc
2010-01-06 08:22:11 -07:00
Keith Whitwell
57531baa92
i965g: back out unintentional changes to linux-dri
2009-12-21 19:21:09 +00:00
Keith Whitwell
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
Jakob Bornecrantz
60769b232c
svga: Build svga driver
2009-11-17 03:18:06 +01:00
Keith Whitwell
7ee60648a3
i965g: hook into build system
2009-10-24 11:55:25 +01:00
Corbin Simpson
fd7ee2bcb7
Kill off trident.
...
Hm. I could have said "chew trident and spit it out," or perhaps
"spear trident," instead. Dohoho.
2009-10-22 12:57:13 -07:00
Corbin Simpson
8e4657a9d4
Nuke s3v.
...
As per FDO #17889 .
2009-10-22 12:29:30 -07:00
Brian Paul
4c13cb65a0
dri: build DRI swrast driver too
2009-04-17 16:10:26 -06:00
Jakob Bornecrantz
e94b4dd4f0
gallium: Disable nouveau by default
...
Most piep drivers should be able to build by default, but since
the nouveau ones depend drm they can't be enabled by default.
2009-02-11 02:43:27 +01:00
Jakob Bornecrantz
43e6272ae5
gallium: Introduce new subdirs build variables
...
(based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
2009-02-10 16:23:02 +01:00
Brian Paul
e13593678f
re-add MSAA support
...
(cherry picked from commit f7d80aa006
)
This also involved adding the new MSAA fields to driCreateConfigs().
Also, re-add prog_instructions->Sampler field for i965 driver. Will
have to revisit that.
2009-02-09 11:16:20 -07:00
Alan Hourihane
af1ce2375e
build default set of progs + egl
2008-11-13 19:38:18 +00:00
Pekka Paalanen
20ff08cd86
Fix configs/linux-dri to build winsys again.
...
SRC_DIRS was being reset, which left winsys unbuilt.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-13 20:44:55 +02:00
Alan Hourihane
b50a0b89d9
build "GLX" egl driver by default and egl demos
2008-10-16 23:42:12 +01:00
Alan Hourihane
cdd97ceca0
add gallium dir
...
winsys/common -> winsys/
2008-09-11 18:06:05 +01: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
ccf1910dd4
consolidate intel directories.
...
we now have
src/gallium/winsys/drm/intel/{common,dri,egl}
2008-08-17 20:17:18 +01:00
Jakob Bornecrantz
e59086ab91
EGL: Only build EGL dri based drivers under linux-dri based configs
2008-07-13 18:05:20 +02:00
Brian Paul
7986baf7cf
build egl subdirs
2008-07-11 15:45:03 -06:00
Jakob Bornecrantz
80ab4c3f8c
mesa: Do not compile the dri drivers in mesa
2008-06-08 17:29:56 +02:00
Jakob Bornecrantz
3d514a9070
gallium: Only build intel_drm for linux-dri targets
2008-06-06 16:50:52 +02:00
Brian Paul
b11aad2abe
build egl_xlib/ too (softpipe_egl.so library)
2008-06-05 14:41:28 -06:00
Alan Hourihane
c218b8c6c6
Build with -O2
2008-06-04 09:56:00 +01:00
George Sapountzis
d4510e53d8
drop GLcore
2008-05-23 22:48:55 +03:00
Jakob Bornecrantz
a22462f6ef
egl: Don't build EGL programs either
2008-05-23 16:25:51 +02:00
Jakob Bornecrantz
2064826bda
egl: Stoped compiling EGL completely
2008-05-23 16:18:42 +02:00
Jakob Bornecrantz
3972961e62
mesa: On second thought lets not build the driver
2008-05-23 11:02:14 +02:00
Zack Rusin
6f25d6d48d
disable egl by default
2008-05-22 22:13:38 -04:00
Jakob Bornecrantz
6c78b8e97b
mesa: Made linux-dri targets build EGL
2008-05-14 17:20:56 +02:00
George Sapountzis
750f52169c
glcore: tree sharing for DRI and XMesa
2008-04-23 11:12:30 +03:00
José Fonseca
90b2beb661
Simplify makefile boilerplate code.
...
Don't define ASM_SOURCES variable globally -- reserve that variable to be defined
locally by makefiles, together with C_SOURCES and CPP_SOURCES.
2008-02-19 14:06:11 +09:00
José Fonseca
1f2d011786
Build glx/x11.
2008-02-18 15:45:29 +09:00
José Fonseca
bfd5916eaf
Code reorganization: split gallium and mesa makefiles.
...
In other words, don't build src/gallium source code from within src/mesa/Makefile.
Also, allow to customize which gallium auxiliary dirs, driver driver, winsys
dirs get built from the config/* files.
2008-02-18 14:25:04 +09:00
José Fonseca
6acd63a498
Code reorganization: update build.
...
Update the Makefiles and includes for the new paths.
Note that there hasn't been no separation of the Makefiles yet, and make is
jumping all over the place. That will be taken care shortly. But for now, make
should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm
might require some minor tweaks.
2008-02-15 17:50:12 +09:00
Dan Nicholson
dbcd20f1c2
configs: Set -fexceptions for GLUT on linux-dri like other targets
...
Quite a while ago, the GCC option -fexceptions was added for building
libglut. See here:
http://article.gmane.org/gmane.comp.video.mesa3d.devel/9499
This was missing in the linux-dri targets.
2007-10-31 16:18:29 -07:00