Patrice Mandin [Sat, 21 Jun 2008 20:59:05 +0000 (22:59 +0200)]
Update for extra vertex attributes
Patrice Mandin [Sat, 21 Jun 2008 10:03:05 +0000 (12:03 +0200)]
nv30: Add state for blend
Patrice Mandin [Sat, 21 Jun 2008 08:11:37 +0000 (10:11 +0200)]
nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones
Patrice Mandin [Fri, 20 Jun 2008 20:19:22 +0000 (22:19 +0200)]
nv30: Add separate nv30 state stuff for fb, based on nv40 one, need to use it now
Younes Manton [Mon, 9 Jun 2008 00:24:13 +0000 (20:24 -0400)]
Merge branch 'gallium-0.1' of ssh://ymanton@git.freedesktop.org/git/nouveau/mesa into gallium-0.1
Younes Manton [Sun, 8 Jun 2008 18:34:41 +0000 (14:34 -0400)]
g3dvl: Reduce number of input vert streams by copying, reusing in shaders.
Reduce number of input vertex streams by using same texcoord stream for
chroma textures, reusing pos stream when calculating texcoords for P, B
macroblocks.
Younes Manton [Sun, 8 Jun 2008 07:04:14 +0000 (03:04 -0400)]
Initial commit for g3dvl.
Initial commit for g3dvl, contains support for basic XvMC features.
- Context, surface, block, macroblock creation and deletion
- Surface rendering
- Frame pictures
- Frame based motion compensation
- Intra-coded macroblocks
- Predicted macroblocks
- Bi-directionally predicted macroblocks
- Surface display
- Color conversion
- Scaling
Ben Skeggs [Sun, 8 Jun 2008 02:50:47 +0000 (12:50 +1000)]
nouveau: kill off surface_alloc_storage()
Ben Skeggs [Fri, 30 May 2008 04:32:59 +0000 (14:32 +1000)]
nouveau: fix warning
Ben Skeggs [Fri, 30 May 2008 01:04:55 +0000 (11:04 +1000)]
nv40: a couple of memory leaks
Ben Skeggs [Fri, 30 May 2008 01:00:59 +0000 (11:00 +1000)]
nouveau: flush pending pushbuf if buffer on validate list at map/del
Ben Skeggs [Thu, 29 May 2008 14:38:07 +0000 (00:38 +1000)]
nouveau: rework buffer validation a bit
Ben Skeggs [Thu, 29 May 2008 14:28:29 +0000 (00:28 +1000)]
nouveau: oops, more tex-surfaces fallout
Ben Skeggs [Mon, 26 May 2008 15:22:22 +0000 (01:22 +1000)]
nouveau: very quick port to tex-surface changes.
probably the last match-gallium-upstream merge for a bit, some cleanup+nv50
work coming RSN...
Ben Skeggs [Mon, 26 May 2008 14:59:41 +0000 (00:59 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
José Fonseca [Mon, 26 May 2008 14:29:38 +0000 (23:29 +0900)]
Revert DOS line endings.
José Fonseca [Mon, 26 May 2008 11:14:40 +0000 (20:14 +0900)]
Remove CVS keywords.
Jakob Bornecrantz [Mon, 26 May 2008 09:20:51 +0000 (11:20 +0200)]
i915: Removed screen sufixes on texture functions
Jakob Bornecrantz [Sun, 25 May 2008 15:26:07 +0000 (17:26 +0200)]
i915: Fix for tex-surface merge
Jakob Bornecrantz [Mon, 26 May 2008 11:04:25 +0000 (13:04 +0200)]
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
Keith Whitwell [Sun, 25 May 2008 14:28:30 +0000 (15:28 +0100)]
cso: use memcpy rather than structure asignment for copying
Apparently gcc will omit to copy hidden padding bytes under some circumstances,
which means later on memcmp() will indicate a difference between structs
even though all the visible members are identical.
Ben Skeggs [Sun, 25 May 2008 04:26:18 +0000 (14:26 +1000)]
nouveau: missed PCI case
Ben Skeggs [Sun, 25 May 2008 04:25:15 +0000 (14:25 +1000)]
nouveau: remove final PIPE_FORMAT_U_* usage
Ben Skeggs [Sun, 25 May 2008 04:19:18 +0000 (14:19 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
José Fonseca [Sat, 24 May 2008 16:35:53 +0000 (01:35 +0900)]
Demangle C++ symbols.
José Fonseca [Sat, 24 May 2008 10:26:14 +0000 (19:26 +0900)]
gallium: Pre-processor for win32 kernel profile output.
José Fonseca [Sat, 24 May 2008 10:25:33 +0000 (19:25 +0900)]
gallium: Poor-man profiler for win32 kernel.
José Fonseca [Sat, 24 May 2008 10:25:02 +0000 (19:25 +0900)]
scons: New profile build.
Jakob Bornecrantz [Fri, 23 May 2008 14:55:30 +0000 (16:55 +0200)]
i915: Revert accidental change
Jakob Bornecrantz [Fri, 23 May 2008 14:11:38 +0000 (16:11 +0200)]
i915: Improved vertex buffer performance
Jakob Bornecrantz [Thu, 22 May 2008 13:02:54 +0000 (15:02 +0200)]
i915: Fix for edgeflags
Jakob Bornecrantz [Fri, 23 May 2008 14:26:14 +0000 (16:26 +0200)]
Merge branch 'gallium-i915-current' into gallium-0.1
Jakob Bornecrantz [Fri, 23 May 2008 14:25:51 +0000 (16:25 +0200)]
egl: Don't build EGL programs either
Jakob Bornecrantz [Fri, 23 May 2008 14:18:42 +0000 (16:18 +0200)]
egl: Stoped compiling EGL completely
Jakob Bornecrantz [Fri, 23 May 2008 09:24:33 +0000 (11:24 +0200)]
i915: Made EGL report the actual modes on the screen/output pair
Thomas Hellstrom [Fri, 23 May 2008 09:14:12 +0000 (11:14 +0200)]
i915: Make batchbuffers larger.
Thomas Hellstrom [Thu, 22 May 2008 14:42:53 +0000 (16:42 +0200)]
i915: Use the malloc pool for constant buffers since they don't go to the GPU directly.
Jakob Bornecrantz [Thu, 22 May 2008 14:24:51 +0000 (16:24 +0200)]
mesa: Added linux-egl target, that only builds the i915simple driver and egl drivers
Jakob Bornecrantz [Thu, 22 May 2008 14:24:10 +0000 (16:24 +0200)]
mesa: On second thought lets not build the driver
Zack Rusin [Fri, 23 May 2008 02:13:38 +0000 (22:13 -0400)]
disable egl by default
José Fonseca [Thu, 22 May 2008 12:54:41 +0000 (21:54 +0900)]
pipebuffer: More robust face null pointers.
It is really the caller responsibility not to call pipebuffer with null
buffers, etc. But don't let the crash happen here, and still asserting
early.
José Fonseca [Thu, 22 May 2008 11:33:17 +0000 (20:33 +0900)]
pipebuffer: Don't retry allocating in slab suballocator.
In pipebuffer, fencing is done at on a level above sub-allocation, so no
matter how many times slab allocator retries no buffer will be freed. The
pipebuffer fencing implemention already retries allocating.
Michel Dänzer [Wed, 21 May 2008 16:15:07 +0000 (17:15 +0100)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian [Wed, 24 Oct 2007 19:55:22 +0000 (13:55 -0600)]
fix assorted bugs, works now
(cherry picked from commit
55d4f32fc211dbc37bd28c0e67da5ce5e0da5777)
Brian [Wed, 21 May 2008 12:59:49 +0000 (06:59 -0600)]
mesa: fix #include path for glapioffsets.h (fixes x86 build)
Zack Rusin [Tue, 20 May 2008 23:18:22 +0000 (19:18 -0400)]
add new binaries to ignore to make 'git status' cleaner
Dan Nicholson [Sat, 29 Sep 2007 18:23:22 +0000 (11:23 -0700)]
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.
Zack Rusin [Tue, 20 May 2008 22:49:40 +0000 (18:49 -0400)]
add a simple but nice example of convolution filters in glsl
shows basics of image processing with glsl
Brian Paul [Tue, 20 May 2008 21:30:23 +0000 (15:30 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 21:20:29 +0000 (15:20 -0600)]
gallium: fix vertex shader mem leak (glRasterPos)
Brian Paul [Tue, 20 May 2008 21:12:50 +0000 (15:12 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 21:12:26 +0000 (15:12 -0600)]
gallium: replace assignment with pipe_texture_reference()
Brian Paul [Tue, 20 May 2008 21:11:53 +0000 (15:11 -0600)]
gallium: fix shader mem leak
Brian Paul [Tue, 20 May 2008 21:11:33 +0000 (15:11 -0600)]
mesa: call glutDestroyWindow()
Brian Paul [Tue, 20 May 2008 20:38:45 +0000 (14:38 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 20:38:22 +0000 (14:38 -0600)]
gallium: move vertex/fragment program unbinding
Brian Paul [Tue, 20 May 2008 20:38:00 +0000 (14:38 -0600)]
gallium: fix default case in st_new_program()
Brian Paul [Tue, 20 May 2008 19:50:10 +0000 (13:50 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 19:48:34 +0000 (13:48 -0600)]
gallium: fix mem leaks
Brian Paul [Tue, 20 May 2008 19:38:59 +0000 (13:38 -0600)]
mesa: call glutDestroyWindow()
Brian Paul [Tue, 20 May 2008 19:38:45 +0000 (13:38 -0600)]
gallium: clean-up glDraw/CopyPixels shaders when destroying context
Brian Paul [Tue, 20 May 2008 19:39:27 +0000 (13:39 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 19:38:59 +0000 (13:38 -0600)]
mesa: call glutDestroyWindow()
Brian Paul [Tue, 20 May 2008 19:38:45 +0000 (13:38 -0600)]
gallium: clean-up glDraw/CopyPixels shaders when destroying context
Brian Paul [Tue, 20 May 2008 17:34:36 +0000 (11:34 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Tue, 20 May 2008 17:31:20 +0000 (11:31 -0600)]
copy StateFlags in _mesa_clone_parameter_list()
cherry-picked from master (
b539b6132141b0f583076355ad158852667b79cd)
Brian Paul [Tue, 20 May 2008 17:29:58 +0000 (11:29 -0600)]
fix incorrect sampler numbering/indexing.
All samplers indexes were zero.
cherry-picked from master (
b6fb0940c226373ac235a5d327d3fcfd742bc6b9)
Brian Paul [Mon, 19 May 2008 22:05:41 +0000 (16:05 -0600)]
gallium: remove dead code
Brian Paul [Mon, 19 May 2008 22:04:02 +0000 (16:04 -0600)]
fix tempReg test in _mesa_combine_programs()
Brian Paul [Mon, 19 May 2008 22:05:41 +0000 (16:05 -0600)]
gallium: remove dead code
Brian Paul [Mon, 19 May 2008 22:04:02 +0000 (16:04 -0600)]
fix tempReg test in _mesa_combine_programs()
Brian Paul [Mon, 19 May 2008 18:48:06 +0000 (12:48 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Mon, 19 May 2008 18:40:11 +0000 (12:40 -0600)]
gallium: fix some texture object leaks
Brian Paul [Mon, 19 May 2008 15:36:10 +0000 (09:36 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Mon, 19 May 2008 15:34:28 +0000 (09:34 -0600)]
if x86_get_func() returns NULL, handle it properly instead of aborting
Brian Paul [Mon, 19 May 2008 15:04:02 +0000 (09:04 -0600)]
fix program delete/refcount bug
cherry-picked from gallium-tex-surfaces
Brian Paul [Mon, 19 May 2008 14:59:41 +0000 (08:59 -0600)]
Fix program refcounting assertion failure during context tear-down
When purging the program hash table, the refcount _should_ be one since
the program is referenced by the hash table. Need to explicitly set to
zero before calling delete().
Also, purge high-level shader hash tables before low-level program hash tabl
cherry-picked from master
José Fonseca [Mon, 19 May 2008 06:18:40 +0000 (15:18 +0900)]
i915simple: Fix win9x build.
José Fonseca [Mon, 19 May 2008 05:47:37 +0000 (14:47 +0900)]
gallium: Additional formats for bump mapping.
José Fonseca [Fri, 16 May 2008 15:12:43 +0000 (00:12 +0900)]
gallium: Fix typo.
Brian Paul [Sun, 18 May 2008 22:37:35 +0000 (16:37 -0600)]
fix program delete/refcount bug
Brian Paul [Sun, 18 May 2008 22:17:50 +0000 (16:17 -0600)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Brian Paul [Sun, 18 May 2008 21:46:58 +0000 (15:46 -0600)]
print vertex.attrib[n] (from master)
Brian Paul [Sun, 18 May 2008 21:32:58 +0000 (15:32 -0600)]
Fix some bugs in material, depth range state
picked from master
Brian Paul [Sun, 18 May 2008 21:23:03 +0000 (15:23 -0600)]
Regenerated API dispatch files
Follow on to cherry-pick from master
Brian Paul [Sun, 18 May 2008 21:21:28 +0000 (15:21 -0600)]
alias ProgramEnvParameter4xyARB and ProgramParameter4xyNV (bug #12935)
these should be the same functions (as per spec).
cherry-picked from master (
86a4810b09097714942bf2b889e6c62357bba931)
Zack Rusin [Fri, 16 May 2008 21:56:38 +0000 (17:56 -0400)]
cosmetic changes
Zack Rusin [Fri, 16 May 2008 21:35:47 +0000 (17:35 -0400)]
fix rsq
Zack Rusin [Fri, 16 May 2008 21:10:52 +0000 (17:10 -0400)]
fix abs and start on rsq
Zack Rusin [Fri, 16 May 2008 20:06:59 +0000 (16:06 -0400)]
do the lit (some artifacts present)
Zack Rusin [Fri, 16 May 2008 18:54:40 +0000 (14:54 -0400)]
implement min/max and abstract ops on vectors
Zack Rusin [Thu, 15 May 2008 21:46:20 +0000 (17:46 -0400)]
llvm: implement sub and abs
Zack Rusin [Thu, 15 May 2008 18:11:19 +0000 (14:11 -0400)]
fix injections of functions from builtins into shaders
Zack Rusin [Thu, 15 May 2008 16:17:46 +0000 (12:17 -0400)]
move the swizzling code to gallivm in preperation for code-generating it
also some minor cleanups
Brian Paul [Sat, 17 May 2008 16:30:21 +0000 (10:30 -0600)]
gallium: in drivers, make copy of tokens passed to pipe->create_vs/fs_state()
The caller can then free the token array immediately.
Brian Paul [Sat, 17 May 2008 14:47:56 +0000 (08:47 -0600)]
gallium: remove deprecated format names
Brian Paul [Sat, 17 May 2008 14:46:43 +0000 (08:46 -0600)]
s/PIPE_FORMAT_U_S8/PIPE_FORMAT_S8_UNORM/
Brian Paul [Fri, 16 May 2008 22:11:00 +0000 (16:11 -0600)]
gallium: fix glBitmap surface memleak in context tear-down
Brian Paul [Fri, 16 May 2008 22:04:30 +0000 (16:04 -0600)]
gallium: release textures during context tear-down (fix mem leak)
Brian Paul [Fri, 16 May 2008 22:04:04 +0000 (16:04 -0600)]
gallium: ref counting clean-ups