Commit graph

92185 commits

Author SHA1 Message Date
Keith Whitwell
1f13545679 fp: put test name in window title, add run script 2008-09-12 10:28:36 +01:00
Keith Whitwell
af74abab6b mesa: get fixed-function program generation working again 2008-09-12 10:04:56 +01:00
Keith Whitwell
52a9dfd4fe use APP_CC, remove redundant target 2008-09-12 10:02:16 +01:00
Xiang, Haihao
b2e083eba2 i965: Add support for G41 chipset which is another 4 series. 2008-09-12 09:25:34 +08:00
Brian Paul
aa66f08a21 cell: initial support for fragment shader code generation.
TGSI shaders are translated into SPE instructions which are then sent to
the SPEs for execution.  Only a few opcodes work, no swizzling yet, no
support for constants/immediates, etc.
2008-09-11 17:59:52 -06:00
Brian Paul
dbbbc33344 use APP_CC 2008-09-11 17:55:53 -06:00
Brian Paul
084ab37b7f cell: fix tile twidding bug seen in the event of multiple expose events 2008-09-11 17:10:32 -06:00
Brian Paul
bc304bbd49 cell: minor improvements to fragment code-gen 2008-09-11 17:10:32 -06:00
Brian Paul
178bbaff80 gallium: add special cases in spe_load_float(), spe_load_int(), added spe_splat() 2008-09-11 17:10:32 -06:00
Brian Paul
be925ab6e8 cell: put cell_ prefix on gen_fragment_function() 2008-09-11 17:10:32 -06:00
Keith Whitwell
fd0ee68305 trivial: remove stray merge conflict 2008-09-11 20:11:11 +01:00
Keith Whitwell
b66ee9e32f st: adapt to new framebuffer struct, with one FIXME outstanding 2008-09-11 20:09:14 +01:00
Keith Whitwell
7ee599d30b mesa: update PointParameter usage 2008-09-11 20:08:07 +01:00
Keith Whitwell
a90cae8a17 demos: fix LIBS ref in makefile 2008-09-11 20:07:41 +01:00
Brian Paul
fbf1586b36 gallium: typo: s/PIPE_FORMAT_Z16UNORM/PIPE_FORMAT_Z16_UNORM/ 2008-09-11 12:01:19 -06:00
Dima Zavin
7d3d5fb7a5 egl_xdri: Add the top-level lib dir so we link against the libGL we built. 2008-09-11 11:43:56 -06:00
Dima Zavin
912488a8d0 egl_dri/egl_xdri: Makefiles should use pkg-config to find libdrm. 2008-09-11 11:43:56 -06:00
Keith Whitwell
536092f9e0 xlib: fix typo 2008-09-11 18:35:19 +01:00
Keith Whitwell
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
Keith Whitwell
685248bea1 mesa: use sources.mak -- need to figure out how to support non-gallium builds also 2008-09-11 18:08:01 +01:00
Alan Hourihane
cdd97ceca0 add gallium dir
winsys/common -> winsys/
2008-09-11 18:06:05 +01:00
Brian Paul
d50d68a1c9 glut: only call glFinish() in processWindowWorkList() for indirect contexts.
Basically, do as the comment says.
2008-09-11 11:05:13 -06:00
Brian Paul
90c93bbeee define new APP_CC configuration variable for building apps/demos/tests
For Cell, need to use different compilers for the libraries vs. the demos/tests
to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11 11:00:54 -06:00
Alan Hourihane
5835d7e573 tree builds 2008-09-11 17:59:58 +01:00
Brian Paul
7ce1d0fb67 cell: more comments, stub code for colormask/logicop/etc 2008-09-11 10:52:03 -06:00
Brian Paul
5c459b3925 simple quad drawing test 2008-09-11 10:43:14 -06:00
Brian Paul
1b5331d7eb cell: fix typos in blend code-gen 2008-09-11 10:39:30 -06:00
Brian Paul
73c6ae98c1 cell: remove old state CMDs, added comments 2008-09-11 10:39:30 -06:00
Brian Paul
f6bf8d9d41 cell: clean-up, comments 2008-09-11 10:39:30 -06:00
Brian Paul
a558369ec6 cell: disable NEW_VS emit 2008-09-11 10:39:29 -06:00
Brian Paul
924653e37d cell: don't build unused sources 2008-09-11 10:39:29 -06:00
Brian Paul
f19903aa83 cell: remove old blend/depth/stencil/logicop structs 2008-09-11 10:39:29 -06:00
Brian Paul
aa4a08d429 cell: asst. clean-up 2008-09-11 10:39:29 -06:00
Brian Paul
283ffdf996 cell: checkpoint: remove more of the old per-fragment code 2008-09-11 10:39:29 -06:00
Brian Paul
add86031db cell: begin new blending code (both codegen and fallback paths) 2008-09-11 10:39:29 -06:00
Brian Paul
6092a05704 cell: fix shuffle in spu_unpack_B8G8R8A8() 2008-09-11 10:39:29 -06:00
Brian Paul
5336e758a4 cell: added cast in spu_splats() call 2008-09-11 10:39:28 -06:00
Brian Paul
701fcee65d cell: remove old per-fragment code, replace with all new code 2008-09-11 10:39:28 -06:00
Brian Paul
284ab5a612 cell: checkpoint commit of new per-fragment processing
Do code generation for alpha test, z test, stencil, blend, colormask
and framebuffer/tile read/write as a single code block.
Ian's previous blend/z/stencil test code is still there but mostly disabled
and will be removed soon.
2008-09-11 10:39:28 -06:00
Brian Paul
ee582fd3a7 gallium: assorted additions and fixes to Cell SPE rtasm code
Fix incorrect opcode for fsmbi.
Added "macro" functions for loading floats/ints, register complement, zero, move.
Added #defines for return address and stack pointer registers.
Added assertions to check that the instruction buffer doesn't overflow.
2008-09-11 10:39:28 -06:00
Brian Paul
04ae4fba3c cell: minor change to Z float/int conversion code (avoid switch) 2008-09-11 10:39:28 -06:00
Brian Paul
cd9722dcdd cell: comments 2008-09-11 10:39:28 -06:00
Brian Paul
0e79e474de cell: comments, etc. 2008-09-11 10:39:28 -06:00
Brian Paul
bb5becf1e2 gallium: comments, assertions, etc 2008-09-11 10:39:28 -06:00
Brian Paul
83054d9297 press 'c' to toggle Z clear value between 0/1 2008-09-11 10:39:27 -06:00
Brian Paul
8df4c3a21f press 'f' to cycle through depth test funcs 2008-09-11 10:39:27 -06:00
Alan Hourihane
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
Keith Whitwell
b645822503 mesa: fix srcRowStride vs srcRowBytes conflict 2008-09-11 16:36:41 +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
Shane Blackett
4d42c5bebf added 24bpp support 2008-09-11 08:36:03 -06:00