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
Brian Paul [Fri, 16 May 2008 22:02:52 +0000 (16:02 -0600)]
mesa: call glutDestroyWindow() on exit to help find mem leaks
Brian Paul [Fri, 16 May 2008 21:48:11 +0000 (15:48 -0600)]
bring in fixes/changes from master
Brian Paul [Fri, 16 May 2008 15:56:59 +0000 (09:56 -0600)]
Fix a program refcounting error, don't share program parameter lists.
The refcounting bug was causing a memleak (unfreed programs).
The old parameter list sharing is not needed since the change in how
uniforms are handled.
Brian Paul [Fri, 16 May 2008 21:34:22 +0000 (15:34 -0600)]
fix an attr/src mix-up when setting-up/binding vertex arrays
This fixes problems with incorrect material coefficients when glMaterial
is called per-vertex.
Brian Paul [Thu, 15 May 2008 01:19:53 +0000 (19:19 -0600)]
fix parsing of state.texenv.color (bug 14931)
cherry-picked from master
Brian Paul [Thu, 15 May 2008 01:14:41 +0000 (19:14 -0600)]
Consolidate texture fetch code and use partial derivatives when possible.
picked from master
Brian Paul [Wed, 14 May 2008 22:44:08 +0000 (16:44 -0600)]
mesa: fix InfoLog memleak, misc sync with master
Eric Anholt [Tue, 15 Jan 2008 23:08:34 +0000 (15:08 -0800)]
Bug #13492: Only call ProgramStringNotify if program parsing succeeded.
Wine intentionally tries some out-of-spec programs to test strictness, and
calling ProgramStringNotify on the results of a failed program parse resulted
in crashes in the 965 driver.
Brian [Tue, 7 Aug 2007 20:42:34 +0000 (21:42 +0100)]
fix swizzle error test (bug 11881)
Brian Paul [Wed, 14 May 2008 22:32:18 +0000 (16:32 -0600)]
fix-up inlined/non-inlined function inconsistencies
cherry-picked from master
Brian Paul [Wed, 14 May 2008 22:30:15 +0000 (16:30 -0600)]
mesa: rm unneeded file
Brian Paul [Wed, 14 May 2008 22:27:34 +0000 (16:27 -0600)]
mesa: prefix rm command with -
Brian Paul [Wed, 14 May 2008 22:20:28 +0000 (16:20 -0600)]
rewrite some of the mat*mat, mat*vec intrinsics
Also, remove obsolete matrix codegen code.
cherry-picked from master
Brian Paul [Wed, 14 May 2008 22:07:18 +0000 (16:07 -0600)]
mesa: regenerate slang built-in data (asin(vec4) fix)
Brian Paul [Wed, 14 May 2008 22:06:10 +0000 (16:06 -0600)]
mesa: fix missing w assignment in asin(vec4)
Brian Paul [Wed, 14 May 2008 22:05:48 +0000 (16:05 -0600)]
mesa: use CALLOC_STRUCT()
Brian Paul [Wed, 14 May 2008 22:05:25 +0000 (16:05 -0600)]
mesa: sync up swrast/s_fragprog.c with master
Brian Paul [Wed, 14 May 2008 22:04:51 +0000 (16:04 -0600)]
mesa: updated comment
Brian Paul [Wed, 14 May 2008 22:04:29 +0000 (16:04 -0600)]
mesa: minor bug fixes from master
Brian Paul [Wed, 14 May 2008 22:04:00 +0000 (16:04 -0600)]
mesa: dead code removal
Brian Paul [Wed, 14 May 2008 22:03:38 +0000 (16:03 -0600)]
mesa: minor bug fixes, null ptr checks, dead code removal
Brian Paul [Wed, 14 May 2008 22:02:20 +0000 (16:02 -0600)]
mesa: fix errors in LightModelProduct state, other misc error cases
Brian Paul [Wed, 14 May 2008 22:01:31 +0000 (16:01 -0600)]
mesa: glUniform(location==-1) is not an error
Brian Paul [Wed, 14 May 2008 18:19:22 +0000 (12:19 -0600)]
fix some additional program refcounting bugs
cherry-picked from master
Brian Paul [Wed, 14 May 2008 18:19:22 +0000 (12:19 -0600)]
fix some additional program refcounting bugs
cherry-picked from master
Zack Rusin [Mon, 12 May 2008 21:17:18 +0000 (17:17 -0400)]
adjust llvm code to the changes in 2.3
Brian [Sat, 10 May 2008 18:46:00 +0000 (12:46 -0600)]
gallium: optimize the flush_spans() function
Brian [Sat, 10 May 2008 18:16:19 +0000 (12:16 -0600)]
gallium: remove unused code
Michel Dänzer [Fri, 9 May 2008 17:16:02 +0000 (18:16 +0100)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Michel Dänzer [Fri, 9 May 2008 17:04:16 +0000 (18:04 +0100)]
draw: Fix number of vertices allocated in draw_pt_emit().
Roland Scheidegger [Fri, 9 May 2008 13:04:33 +0000 (15:04 +0200)]
gallium: depth textures have usage depth_stencil instead of render_target
Keith Whitwell [Fri, 9 May 2008 14:02:59 +0000 (15:02 +0100)]
draw: fix translate double-free, minor cleanups
Keith Whitwell [Fri, 9 May 2008 12:11:48 +0000 (13:11 +0100)]
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
Keith Whitwell [Fri, 9 May 2008 12:10:15 +0000 (13:10 +0100)]
draw: mimize cost of translate key compares, use cache universally
Keith Whitwell [Fri, 9 May 2008 12:09:58 +0000 (13:09 +0100)]
translate: helper functions for mimizing cost of key compares
José Fonseca [Fri, 9 May 2008 09:47:44 +0000 (18:47 +0900)]
gallium: Define util_vsprintf.
Keith Whitwell [Fri, 9 May 2008 07:56:01 +0000 (08:56 +0100)]
Merge branch 'gallium-0.1' into gallium-tex-surfaces
José Fonseca [Fri, 9 May 2008 05:34:51 +0000 (14:34 +0900)]
gallium: Disable debug_get_option for release builds on Windows.
It always creates the C:\gallium.cfg , even if it does not exists, which
might be confusing.
José Fonseca [Fri, 9 May 2008 02:02:10 +0000 (11:02 +0900)]
gallium: Don't serialize GPU writes.
Only make sure the GPU is finished with a buffer before mapping.
The opposite -- waiting for the CPU to be finished before handing
to the CPU -- must be done before fencing.
Brian Paul [Fri, 9 May 2008 01:32:49 +0000 (19:32 -0600)]
gallium: don't free shader.tokens in get_passthrough_fs()