Keith Whitwell [Thu, 11 Sep 2008 17:32:05 +0000 (18:32 +0100)]
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
Keith Whitwell [Thu, 11 Sep 2008 16:39:16 +0000 (17:39 +0100)]
mesa: use sources.mak -- need to figure out how to support non-gallium builds also
Alan Hourihane [Thu, 11 Sep 2008 17:06:05 +0000 (18:06 +0100)]
add gallium dir
winsys/common -> winsys/
Brian Paul [Thu, 11 Sep 2008 17:05:13 +0000 (11:05 -0600)]
glut: only call glFinish() in processWindowWorkList() for indirect contexts.
Basically, do as the comment says.
Brian Paul [Thu, 11 Sep 2008 17:00:54 +0000 (11:00 -0600)]
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"
Alan Hourihane [Thu, 11 Sep 2008 16:59:58 +0000 (17:59 +0100)]
tree builds
Brian Paul [Thu, 11 Sep 2008 16:52:03 +0000 (10:52 -0600)]
cell: more comments, stub code for colormask/logicop/etc
Brian Paul [Thu, 11 Sep 2008 16:43:14 +0000 (10:43 -0600)]
simple quad drawing test
Brian Paul [Thu, 11 Sep 2008 16:38:55 +0000 (10:38 -0600)]
cell: fix typos in blend code-gen
Brian Paul [Thu, 11 Sep 2008 16:38:37 +0000 (10:38 -0600)]
cell: remove old state CMDs, added comments
Brian Paul [Thu, 11 Sep 2008 16:33:24 +0000 (10:33 -0600)]
cell: clean-up, comments
Brian Paul [Thu, 11 Sep 2008 16:33:13 +0000 (10:33 -0600)]
cell: disable NEW_VS emit
Brian Paul [Thu, 11 Sep 2008 16:27:17 +0000 (10:27 -0600)]
cell: don't build unused sources
Brian Paul [Thu, 11 Sep 2008 16:26:00 +0000 (10:26 -0600)]
cell: remove old blend/depth/stencil/logicop structs
Brian Paul [Thu, 11 Sep 2008 16:25:38 +0000 (10:25 -0600)]
cell: asst. clean-up
Brian Paul [Thu, 11 Sep 2008 16:13:20 +0000 (10:13 -0600)]
cell: checkpoint: remove more of the old per-fragment code
Brian Paul [Thu, 11 Sep 2008 16:08:06 +0000 (10:08 -0600)]
cell: begin new blending code (both codegen and fallback paths)
Brian Paul [Thu, 11 Sep 2008 15:55:39 +0000 (09:55 -0600)]
cell: fix shuffle in spu_unpack_B8G8R8A8()
Brian Paul [Thu, 11 Sep 2008 14:44:54 +0000 (08:44 -0600)]
cell: added cast in spu_splats() call
Brian Paul [Thu, 11 Sep 2008 00:51:43 +0000 (18:51 -0600)]
cell: remove old per-fragment code, replace with all new code
Brian Paul [Thu, 11 Sep 2008 00:22:00 +0000 (18:22 -0600)]
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.
Brian Paul [Wed, 10 Sep 2008 23:11:48 +0000 (17:11 -0600)]
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.
Brian Paul [Mon, 8 Sep 2008 17:53:14 +0000 (11:53 -0600)]
cell: minor change to Z float/int conversion code (avoid switch)
Brian Paul [Mon, 8 Sep 2008 17:50:13 +0000 (11:50 -0600)]
cell: comments
Brian Paul [Fri, 5 Sep 2008 19:55:02 +0000 (13:55 -0600)]
cell: comments, etc.
Brian Paul [Fri, 5 Sep 2008 19:54:14 +0000 (13:54 -0600)]
gallium: comments, assertions, etc
Brian Paul [Fri, 5 Sep 2008 19:07:43 +0000 (13:07 -0600)]
press 'c' to toggle Z clear value between 0/1
Brian Paul [Fri, 5 Sep 2008 18:59:40 +0000 (12:59 -0600)]
press 'f' to cycle through depth test funcs
Alan Hourihane [Thu, 11 Sep 2008 16:32:18 +0000 (17:32 +0100)]
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
Keith Whitwell [Thu, 11 Sep 2008 15:36:41 +0000 (16:36 +0100)]
mesa: fix srcRowStride vs srcRowBytes conflict
Keith Whitwell [Thu, 11 Sep 2008 15:05:15 +0000 (16:05 +0100)]
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
Shane Blackett [Thu, 11 Sep 2008 14:35:27 +0000 (08:35 -0600)]
added 24bpp support
Shane Blackett [Wed, 10 Sep 2008 14:22:45 +0000 (08:22 -0600)]
Fixes for Mingw
Eric Anholt [Mon, 8 Sep 2008 15:52:48 +0000 (08:52 -0700)]
intel: track move of bo_exec from drivers to bufmgr.
Eric Anholt [Sat, 6 Sep 2008 02:09:43 +0000 (03:09 +0100)]
intel: track bufmgr move to libdrm_intel and bufmgr_fake irq emit/wait change.
Eric Anholt [Thu, 4 Sep 2008 21:16:31 +0000 (22:16 +0100)]
intel: Move the bufmgr back to the screen.
Mesa requires that we be able to share objects between contexts, which means
that the objects need to be created by the same bufmgr, and the bufmgr
internally requires pthread protection for thread safety.
Rely on the bufmgr having appropriate locking.
José Fonseca [Wed, 10 Sep 2008 01:33:03 +0000 (10:33 +0900)]
tgsi: Fix newline pos.
José Fonseca [Wed, 10 Sep 2008 01:32:52 +0000 (10:32 +0900)]
tgsi: Verify constants are set before attempting to read them.
José Fonseca [Tue, 9 Sep 2008 13:17:31 +0000 (22:17 +0900)]
softpipe: Code (commented out) to dump BMPs.
José Fonseca [Tue, 9 Sep 2008 12:16:36 +0000 (21:16 +0900)]
util: Ensure we always have a full qualified file name on windows display.
Michal Krol [Tue, 9 Sep 2008 09:25:05 +0000 (11:25 +0200)]
util: Enable u_stream_std.c for PIPE_SUBSYSTEM_WINDOWS_USER.
Michal Krol [Tue, 9 Sep 2008 09:21:57 +0000 (11:21 +0200)]
softpipe: Silence compiler warning on Windows.
Michal Krol [Mon, 8 Sep 2008 21:04:17 +0000 (23:04 +0200)]
softpipe: Protect pipe_condvar_signal/broadcast calls with a mutex.
Michal Krol [Mon, 8 Sep 2008 15:21:13 +0000 (17:21 +0200)]
softpipe: Set SP_NUM_QUAD_THREADS 1 effectively disabling multithreaded softpipe.
We want to make it env variable, or even better, autodetect as the feature makes
softpipe run slower on a single CPU.
Michal Krol [Sat, 6 Sep 2008 14:35:23 +0000 (16:35 +0200)]
softpipe: More improvements for multithreaded softpipe.
Store only input and inout of a quad_header in job que.
Michal Krol [Sat, 6 Sep 2008 14:02:24 +0000 (16:02 +0200)]
softpipe: Split changing fields of quad_header into input, inout and output parts.
Michal Krol [Sat, 6 Sep 2008 13:19:02 +0000 (15:19 +0200)]
softpipe: Improve multithreaded softpipe.
Use condition vars to communicate between threads instead of stalling.
Michal Krol [Fri, 5 Sep 2008 21:21:08 +0000 (23:21 +0200)]
softpipe: First attempts at multithreaded softpipe.
Configured for 2 cores.
Michal Krol [Fri, 5 Sep 2008 15:08:50 +0000 (17:08 +0200)]
tgsi: Cleanup code.
José Fonseca [Mon, 8 Sep 2008 13:57:01 +0000 (22:57 +0900)]
trace: Request a growable file.
José Fonseca [Mon, 8 Sep 2008 13:56:38 +0000 (22:56 +0900)]
util: Allow to define the maximum file size.
This avoids splitting the bitmaps in many files.
José Fonseca [Mon, 8 Sep 2008 13:21:33 +0000 (22:21 +0900)]
util: Dump surfaces to BMP.
This allows quick inspection of surfaces in mass scale.
José Fonseca [Mon, 8 Sep 2008 12:50:50 +0000 (21:50 +0900)]
scons: Install shared libs in the right subdir.
José Fonseca [Mon, 8 Sep 2008 02:09:48 +0000 (11:09 +0900)]
trace: Use util's stream.
José Fonseca [Mon, 8 Sep 2008 02:09:23 +0000 (11:09 +0900)]
util: Rip-off trace's os-independent stream code.
José Fonseca [Sun, 7 Sep 2008 22:54:15 +0000 (07:54 +0900)]
scons: Install libGL.so and respective symlinks.
Brian Paul [Fri, 5 Sep 2008 16:18:00 +0000 (10:18 -0600)]
cell: code clean-up, comments
Brian Paul [Fri, 5 Sep 2008 16:16:27 +0000 (10:16 -0600)]
cell: convert clear color if needed
Brian Paul [Fri, 5 Sep 2008 16:11:22 +0000 (10:11 -0600)]
softpipe: convert clear color to surface format if needed
Brian Paul [Fri, 5 Sep 2008 16:10:55 +0000 (10:10 -0600)]
gallium: document that clear color is intentionally always PIPE_FORMAT_A8R8G8B8_UNORM
Brian Paul [Fri, 5 Sep 2008 16:10:18 +0000 (10:10 -0600)]
gallium: remove debug code from prev commit
Brian Paul [Fri, 5 Sep 2008 16:09:48 +0000 (10:09 -0600)]
gallium: new util_unpack_color_ub() function
Michal Krol [Fri, 5 Sep 2008 14:47:06 +0000 (16:47 +0200)]
gallium: Add pipe_thread primitives for PIPE_OS_LINUX.
Brian Paul [Fri, 5 Sep 2008 14:07:20 +0000 (08:07 -0600)]
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
Brian Paul [Fri, 5 Sep 2008 14:06:59 +0000 (08:06 -0600)]
mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()
Brian Paul [Thu, 4 Sep 2008 21:25:32 +0000 (15:25 -0600)]
mesa: replace MALLOC w/ CALLOC to fix valgrind warning
Michal Krol [Fri, 5 Sep 2008 13:10:47 +0000 (15:10 +0200)]
gallium: Add pipe_thread primitives for PIPE_SUBSYSTEM_WINDOWS_USER config.
Michal Krol [Fri, 5 Sep 2008 10:25:50 +0000 (12:25 +0200)]
mesa: _mesa_program_state_string() returns char *, not const char *.
Dave Airlie [Fri, 5 Sep 2008 03:48:51 +0000 (13:48 +1000)]
intel: only enable occlusion query if the drm has defines.
This interface has to be re-written to not be dumb and to work
for multiple apps.
José Fonseca [Fri, 5 Sep 2008 01:29:17 +0000 (10:29 +0900)]
tgsi: Refactor tgsi_dump to avoid using string buffers when dumping.
This fixes a stack overflow when dumping shaders.
It ended up being pretty much as the original code Michal had before,
before I went on a cleanup rampage on it and took things that ended up
needing...
José Fonseca [Fri, 5 Sep 2008 01:27:03 +0000 (10:27 +0900)]
gallium: Pass 512 bytes max to EngDebugPrint.
José Fonseca [Fri, 5 Sep 2008 01:26:30 +0000 (10:26 +0900)]
gallium: New pf_has_alpha utility function.
José Fonseca [Thu, 4 Sep 2008 13:23:32 +0000 (22:23 +0900)]
python: Cleanup tri example.
Brian Paul [Fri, 5 Sep 2008 01:10:05 +0000 (19:10 -0600)]
cell: move batch buffer init code
Brian Paul [Fri, 5 Sep 2008 01:09:50 +0000 (19:09 -0600)]
cell: comments
Brian Paul [Fri, 5 Sep 2008 01:00:56 +0000 (19:00 -0600)]
cell: more cell_init_*_functions()
Brian Paul [Fri, 5 Sep 2008 00:36:22 +0000 (18:36 -0600)]
cell: implement CELL_DEBUG env/options var
Options so far:
"checker" module tile clear color by SPU ID to see where the tiles are
"sync" to do synchronous DMA (only partially implemented)
Brian Paul [Thu, 4 Sep 2008 21:25:45 +0000 (15:25 -0600)]
mesa: improved gl_buffer_object reference counting
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
Brian Paul [Thu, 4 Sep 2008 21:05:03 +0000 (15:05 -0600)]
mesa: fix minor mem leak
Brian Paul [Thu, 4 Sep 2008 20:58:02 +0000 (14:58 -0600)]
mesa: improved gl_buffer_object reference counting
Use new _mesa_reference_buffer_object() function wherever possible.
Fixes buffer object/display list crash reported in ParaView.
Brian Paul [Thu, 4 Sep 2008 18:36:20 +0000 (12:36 -0600)]
cell: assorted comments, clean-ups, etc.
Brian Paul [Thu, 4 Sep 2008 16:38:00 +0000 (10:38 -0600)]
cell: use util_surface_copy/fill()
Brian Paul [Thu, 4 Sep 2008 16:37:30 +0000 (10:37 -0600)]
cell: include p_inlines.h
Brian Paul [Thu, 4 Sep 2008 16:32:29 +0000 (10:32 -0600)]
softpipe: use the new util_surface_copy/fill() functions
Brian Paul [Thu, 4 Sep 2008 16:31:50 +0000 (10:31 -0600)]
gallium: remove the copyHeight hack for compresssed formats
Brian Paul [Thu, 4 Sep 2008 16:31:23 +0000 (10:31 -0600)]
gallium: new util_surface_copy() and util_surface_fill() helpers
These are plug-in fallbacks for the pipe->surface_copy() and
pipe->surface_fill() functions.
Michal Krol [Thu, 4 Sep 2008 11:37:15 +0000 (13:37 +0200)]
mesa: Silence compiler warnings on Windows.
Kristian Høgsberg [Thu, 4 Sep 2008 10:23:14 +0000 (06:23 -0400)]
configure.ac: bump dri2proto requirement, drop TTM_API define.
Xiang, Haihao [Thu, 4 Sep 2008 03:32:52 +0000 (11:32 +0800)]
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
Cherry-picked from master
Xiang, Haihao [Thu, 4 Sep 2008 03:35:15 +0000 (11:35 +0800)]
intel: Fix depth_stencil texture.
Xiang, Haihao [Thu, 4 Sep 2008 03:32:52 +0000 (11:32 +0800)]
mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24
Jakob Bornecrantz [Thu, 4 Sep 2008 02:35:01 +0000 (10:35 +0800)]
mesa: Support for MESA_FORMAT_S8_Z24 texture
cherry-picked from gallium-0.1
José Fonseca [Thu, 4 Sep 2008 02:15:19 +0000 (11:15 +0900)]
mesa: Remove unused var.
José Fonseca [Thu, 4 Sep 2008 02:15:08 +0000 (11:15 +0900)]
softpipe: Add missing include.
José Fonseca [Thu, 4 Sep 2008 02:14:59 +0000 (11:14 +0900)]
i915: Add missing include.
José Fonseca [Thu, 4 Sep 2008 02:14:35 +0000 (11:14 +0900)]
gallium: Fix typo.
José Fonseca [Thu, 4 Sep 2008 00:34:12 +0000 (09:34 +0900)]
cell: Use pipe_buffer_* inlines as much as possible.
José Fonseca [Thu, 4 Sep 2008 00:34:04 +0000 (09:34 +0900)]
i915: Use pipe_buffer_* inlines as much as possible.
José Fonseca [Thu, 4 Sep 2008 00:33:47 +0000 (09:33 +0900)]
i965: Use pipe_buffer_* inlines as much as possible.
José Fonseca [Thu, 4 Sep 2008 00:33:27 +0000 (09:33 +0900)]
softpipe: Use pipe_buffer_* inlines as much as possible.
projects / profile / ivi / mesa.git / log