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
Keith Whitwell
e6887a5752
draw: attempt atomic submit of large drawelements calls
2008-08-26 09:36:52 +01:00
Keith Whitwell
026e7731e5
vbo: seed initial max_element value with a more likely candidate
2008-08-26 09:36:47 +01:00
Brian
6ba9fb9b66
cell: asst fixes to get driver building/running again.
...
Note that SPU vertex transformation is disabled at this time.
2008-08-25 11:31:59 -06:00
Brian
60ac76175b
gallium: added const qualifiers on some draw funcs
2008-08-25 11:30:57 -06:00
Brian
a644c5a850
gallium: include p_debug.h for non-HAVE_POSIX_MEMALIGN
2008-08-25 11:30:20 -06:00
Brian
fd06d01b80
gallium: include <sched.h> on linux to get sched_yield() proto
2008-08-25 11:29:39 -06:00
Brian Paul
80af50b35b
mesa: glsl: regenerated file
2008-08-25 09:20:26 -06:00
Brian Paul
2d5087bf74
mesa: glsl: grab latest fixes from gallium-0.1 branch
...
Includes:
1. Fixes failed asserting about bad swizzles in src reg emit.
2. Tracks uniform var usage.
3. Emit exp() in terms of EXP2 instruction.
2008-08-25 09:20:00 -06:00
Brian Paul
d6df735f1c
mesa: set version string to 7.3-devel
2008-08-25 09:18:33 -06:00
Brian Paul
85813e36f2
gallium: include u_math.h
2008-08-25 08:32:50 -06:00
Michal Krol
2c4661f8fc
gallium: Add missing includes.
2008-08-25 10:42:25 +02:00
Brian
6fd2feaad7
gallium: include u_memory.h, u_math.h
2008-08-24 18:10:50 -06:00
Brian Paul
4c84e940d0
gallium: remove old tile util files
2008-08-24 17:49:11 -06:00
Brian Paul
4f25420bdd
gallium: refactor/replace p_util.h with util/u_memory.h and util/u_math.h
...
Also, rename p_tile.[ch] to u_tile.[ch]
2008-08-24 17:48:55 -06:00
Dave Airlie
f75843a517
Revert "Revert "Merge branch 'drm-gem'""
...
This reverts commit 7c81124d7c
2008-08-24 17:59:10 +10:00
Dave Airlie
7c81124d7c
Revert "Merge branch 'drm-gem'"
...
This reverts commit 53675e5c05
2008-08-24 17:52:40 +10:00
Michal Krol
ec7415642d
trace: Include u_string.h.
2008-08-23 12:31:50 +02:00
Michal Krol
e7ff7f78be
util: Silence compiler warnings on Windows.
2008-08-23 12:31:16 +02:00
Michal Krol
f3dfd5969d
util: Include missing u_rect.h.
2008-08-23 12:30:39 +02:00
Brian Paul
2b87174ec3
gallium: rename p_util.c to u_rect.c (it only contains rect copy/fill helpers)
2008-08-22 16:22:35 -06:00
Brian Paul
fe1e39afbb
gallium: move pipe_copy_rect(), pipe_fill_rect() protos into new u_rect.h header
2008-08-22 16:19:22 -06:00
Brian Paul
a13475ff00
gallium: replace align_int() with align()
...
The two functions are identical. Removed align_int() from p_util.h
2008-08-22 16:09:37 -06:00
Brian Paul
f9c04d55d0
gallium: insert __cplusplus/extern wrappings
2008-08-22 15:53:28 -06:00
Brian Paul
a22bdd42d7
gallium: move math macros from p_util.h to u_math.h
...
More can be done...
2008-08-22 15:51:38 -06:00
Brian Paul
9935e3b730
gallium: stop using ifloor(), FABSF(), etc
2008-08-22 15:51:02 -06:00
Brian Paul
120270def7
gallium: stop using FABSF() macro
2008-08-22 15:49:36 -06:00
Brian Paul
1a46dcc8a9
gallium: replace LOG2() macro with util_fast_log2() inline func
2008-08-22 15:25:21 -06:00
Brian Paul
1c2ff4d9e6
gallium: use new util_fast_exp2(), _log2(), pow() functions
...
New code surrounded with #if FAST_MATH to allow comparing against original
code if we need to debug.
2008-08-22 15:16:43 -06:00
Brian Paul
07bebb839d
mesa: glsl: regenerated file
2008-08-22 15:14:47 -06:00
Brian Paul
47d4b958cf
mesa: glsl: implement exp() functions in terms of EXP asm instruction, not pow
2008-08-22 15:14:36 -06:00
Brian Paul
9e2b867b3f
gallium: new u_math.[ch] files for math functions
...
So far, optimized/low-precision versions of exp(), exp2(), log2(), pow().
2008-08-22 15:13:47 -06:00
José Fonseca
d32f51d471
python/retrace: Interpret texture/surfaces destructions.
2008-08-22 03:14:51 +01:00
José Fonseca
807a7487ff
trace: Don't trace texture/surfaces releases, only destructions.
2008-08-22 03:14:24 +01:00
José Fonseca
152d00d199
trace: Use a 4 hexadecimal digit suffix.
2008-08-22 03:13:27 +01:00
José Fonseca
7f3c3683ce
python/retrace: Process the trace call-by-call (instead of reading everything into memory).
2008-08-22 01:23:48 +01:00
Krzysztof Czurylo
a35002c167
965: Fix incorrect backface culling
...
Fix incorrect backface culling for OGL tunnel in wireframe and
point mode.
2008-08-21 15:01:59 -07:00
Krzysztof Czurylo
6f4fd3a432
Call _ae_update_state when array enable state changes
...
Basically, the application enables client vertex and color arrays,
renders something, then disables color array, and renders something
else (using vertex array only). Even though the color array is
disabled (and the pointer is no longer valid), the driver still tries
to read color data from this array (which results in an exception).
This is because enabling/disabling array does not trigger
_ae_update_state() and the list of enabled arrays is not updated.
_ae_update_state() it's called on the first state validation only (as
all the "dirty" flags are set at the beginning). Any further change to
client arrays' state has no effect.
2008-08-21 15:01:59 -07:00
Krzysztof Czurylo
be30fddc7c
965: Fix color clamping issues
...
Patch is correctly applied this time.
2008-08-21 15:01:59 -07:00
Ian Romanick
1a244cd9e2
Formatting changes to ease application of patches
2008-08-21 15:01:59 -07:00
Eric Anholt
687cd467b3
i965: use dri_bo_subdata in vertex upload to get pwrite used.
...
Otherwise, we would ping-pong objects to GTT and back as we did pwrite on
indices (flushed and mapped to GTT) and mapped for vertices (moved back to
CPU domain).
Fixes bug #17180 .
2008-08-21 12:15:17 -07:00
Eric Anholt
021ce883e6
Flush vertices when updating texObj->GenerateMipmap state.
...
Caught by texturing/gen-teximage test in piglit.
2008-08-21 11:21:22 -07:00
José Fonseca
10624065b0
python/retrace: Support gziped traces.
2008-08-21 18:46:04 +01:00
José Fonseca
34d12c1787
trace: Hack to detect writes to user buffers.
...
It often happens that new data is written directly to the user buffers
without mapping/unmapping. This hack marks user buffers and dumps them
before passing them to pipe context.
2008-08-21 18:46:04 +01:00
José Fonseca
0fff3e4ea9
trace: Split the output stream on windows.
...
Because windows limits the ammount of memory that can be mapped.
2008-08-21 18:46:04 +01:00
José Fonseca
f52db6cd44
scons: Build the trace pipe driver by default.
2008-08-21 18:46:03 +01:00
Peter Hutterer
3a94b25538
Report damage before modifying the area, not after.
...
If we copy the area before reporting the damage in this area, the server may
restore buffered data over the new data, leading to artefacts on the screen.
Reproducable with two cursors (second of which is SW rendered) and moving
windows around in compiz.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16384 .
2008-08-21 11:22:40 +02:00
Eric Anholt
495c02262e
intel: Fix SGIS_generate_mipmap after a miptree had been validated.
...
Previously, the updated images would be ignored because the miptree in the
image matched the miptree in the object, even though Mesa core had just attached
updated contents in ->Data. Additionally, Mesa core could have tried to
free inside our miptree if it had already been validated.
Fixes bug #17077 .
2008-08-20 23:18:02 -07:00
Brian Paul
8f1d5ca086
use ftransform()
2008-08-20 15:33:03 -06:00
Kristof Ralovich
8434c65bb9
glx: free driScreen in FreeScreenConfigs()
2008-08-20 15:33:03 -06:00
