Ben Skeggs [Mon, 28 Apr 2008 05:42:19 +0000 (15:42 +1000)]
nv40: do full swtnl fallback when edge flags present.
This isn't necessary, with some effort we can do this on the hw. However,
until I encounter something "real" that uses them there's not a lot of
point.
Ben Skeggs [Sun, 27 Apr 2008 08:12:14 +0000 (18:12 +1000)]
nouveau: stub set_edgeflags for all nv pipe drivers
Ben Skeggs [Sun, 27 Apr 2008 08:04:50 +0000 (18:04 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Brian [Sat, 26 Apr 2008 01:25:26 +0000 (19:25 -0600)]
gallium: fix broken SGT, SLE
Brian [Sat, 26 Apr 2008 00:46:29 +0000 (18:46 -0600)]
use PIPE_ARCH_X86
Brian Paul [Fri, 25 Apr 2008 21:59:55 +0000 (15:59 -0600)]
gallium: tweak comments, minor var renaming
Brian Paul [Fri, 25 Apr 2008 21:55:47 +0000 (15:55 -0600)]
gallium: tweak comments, minor var renaming
Brian Paul [Fri, 25 Apr 2008 22:12:11 +0000 (16:12 -0600)]
gallium: remove unneeded st->bitmap_texcoord_bias
Brian Paul [Fri, 25 Apr 2008 21:23:21 +0000 (15:23 -0600)]
gallium: use simple color pass-through fragment shader if textures don't exist
If we run out of texture memory we may not have the texture needed by the
fragment shader. If this happens, plug in a color passthrough shader.
So instead of crashing, we just don't see the texture.
GL_OUT_OF_MEMORY is raised, of course.
Brian Paul [Fri, 25 Apr 2008 21:21:00 +0000 (15:21 -0600)]
gallium: added null ptr check
Brian Paul [Fri, 25 Apr 2008 18:00:18 +0000 (12:00 -0600)]
gallium: added a null ptr check
Brian Paul [Fri, 25 Apr 2008 20:15:42 +0000 (14:15 -0600)]
gallium: fix typo s/_mesa_unmap_drapix_pbo/_mesa_unmap_drawpix_pbo/
Brian Paul [Fri, 25 Apr 2008 20:14:09 +0000 (14:14 -0600)]
gallium: consolidate quad drawing code
Brian Paul [Fri, 25 Apr 2008 20:00:40 +0000 (14:00 -0600)]
gallium: remove unused st_draw_vertices()
Brian Paul [Fri, 25 Apr 2008 19:59:25 +0000 (13:59 -0600)]
gallium: use util_draw_vertex_buffer() instead of st_draw_vertices()
José Fonseca [Fri, 25 Apr 2008 16:55:32 +0000 (01:55 +0900)]
scons: Silent MSVC CRT security warnings.
Brian Paul [Fri, 25 Apr 2008 16:33:48 +0000 (10:33 -0600)]
gallium: fix the compressed texture hack in st_texture_image_copy()
Actually, the hack is still there and needs to be revisited, but I get a bit
further with compressed textures now.
José Fonseca [Fri, 25 Apr 2008 16:14:32 +0000 (01:14 +0900)]
scons: A few fixes for building mesa on windows.
Keith Whitwell [Fri, 25 Apr 2008 15:16:06 +0000 (16:16 +0100)]
draw: emit extra flags whenever pipeline is active
The assert was in fact over-sensitive, but emitting the extra flags
is pretty trivial & we may as well just do it whenever we know the
pipeline is running.
Michel Dänzer [Fri, 25 Apr 2008 14:01:09 +0000 (15:01 +0100)]
gallium: Use util_blit_pixels() for glCopyTexSubImage when appropriate.
Michel Dänzer [Fri, 25 Apr 2008 13:57:50 +0000 (14:57 +0100)]
gallium: Add draw_pt_varray.c to scons build.
Keith Whitwell [Fri, 25 Apr 2008 13:20:02 +0000 (14:20 +0100)]
tgsi: fix compile when HIGH_PRECISION not defined
Keith Whitwell [Fri, 25 Apr 2008 13:10:32 +0000 (14:10 +0100)]
draw: no need to special-case elts/get_elts for varray frontend
Keith Whitwell [Fri, 25 Apr 2008 13:10:02 +0000 (14:10 +0100)]
draw: remove unused vars
Zack Rusin [Thu, 24 Apr 2008 20:22:47 +0000 (16:22 -0400)]
frontend for rendering without elts
José Fonseca [Fri, 25 Apr 2008 10:53:13 +0000 (19:53 +0900)]
scons: More windows userspace fixes.
Michel Dänzer [Fri, 25 Apr 2008 09:34:20 +0000 (10:34 +0100)]
gallium: Tell the driver the texture is updated when we finish rendering to it.
José Fonseca [Fri, 25 Apr 2008 09:19:51 +0000 (18:19 +0900)]
gallium: Windows user mode portability fixes.
José Fonseca [Fri, 25 Apr 2008 09:18:48 +0000 (18:18 +0900)]
gallium: New configuration header.
To abstract all those weird #ifdef (__???__) checks.
It should typically be the first included header.
José Fonseca [Fri, 25 Apr 2008 09:16:25 +0000 (18:16 +0900)]
scons: Teach scons about user-land windows.
Actually, more like get rid of all our hacks when compiling for
user-land windows.
Only MSVC is supported atm though.
Brian Paul [Thu, 24 Apr 2008 22:40:08 +0000 (16:40 -0600)]
gallium: fix an edgeflags crash
Keith Whitwell [Thu, 24 Apr 2008 22:31:35 +0000 (23:31 +0100)]
draw: remove old assignment of edgeflag value
Brian Paul [Thu, 24 Apr 2008 22:01:18 +0000 (16:01 -0600)]
gallium: initial edgeflags code
Brian Paul [Thu, 24 Apr 2008 21:59:08 +0000 (15:59 -0600)]
gallium: plug in softpipe_set_edgeflags() function
Brian Paul [Thu, 24 Apr 2008 21:58:46 +0000 (15:58 -0600)]
gallium: comments
Keith Whitwell [Thu, 24 Apr 2008 20:13:56 +0000 (21:13 +0100)]
draw: default edgeflag should be one
Brian Paul [Thu, 24 Apr 2008 19:44:40 +0000 (13:44 -0600)]
gallium: disable the bitmap/texcoord bias
Doesn't seem to be needed after fixing the float->int conversion problem.
Brian Paul [Thu, 24 Apr 2008 19:36:26 +0000 (13:36 -0600)]
mesa: adjust glBitmap coords by a small epsilon
Fixes problem with bitmaps jumping around by one pixel depending on window
size. The rasterpos is often X.9999 instead of X+1.
Run progs/redbook/drawf and resize window to check.
Brian Paul [Thu, 24 Apr 2008 18:11:24 +0000 (12:11 -0600)]
gallium: use cso_destroy_vertex/fragment_shader() functions
Also, rearrange the st_destroy_context() code a bit to prevent some
invalid/NULL ptr derefs during tear-down.
Brian Paul [Thu, 24 Apr 2008 18:10:14 +0000 (12:10 -0600)]
gallium: make cso_release_all() public
Brian Paul [Thu, 24 Apr 2008 17:59:22 +0000 (11:59 -0600)]
gallium: minor clean-ups, comments
Brian Paul [Thu, 24 Apr 2008 17:56:06 +0000 (11:56 -0600)]
gallium: tweak the new shader delete funcs
Brian Paul [Thu, 24 Apr 2008 17:52:37 +0000 (11:52 -0600)]
gallium: added cso_delete_vertex_fragment_shader() functions
The state tracker now uses these functions to free shaders, rather than
the pipe->delete_vs/fs-state() functions. Before, we could get in a situation
where we free() a shader and happen to alloc() a new one at the same address.
The cso_set_vertex/fragment_shader() function would no-op the state change
since the pointers were the same. This led to problems elsewhere, of course.
The new delete functions null-out the CSO's current shader pointers.
Michel Dänzer [Thu, 24 Apr 2008 17:39:25 +0000 (18:39 +0100)]
gallium: Make sure the size of non-existent storage components is set to 0.
Before adding support for formats with unused storage components, the size of
components swizzled to 0 or 1 was ignored, so this didn't matter.
Jakob Bornecrantz [Thu, 24 Apr 2008 15:07:45 +0000 (17:07 +0200)]
i915: Fix for wrong texture in texobj with VBUF
Michal Krol [Thu, 24 Apr 2008 12:05:39 +0000 (14:05 +0200)]
translate: Actually return a value from translate_cache_create().
Keith Whitwell [Thu, 24 Apr 2008 11:38:58 +0000 (12:38 +0100)]
trivial: simple edgeflag test
Keith Whitwell [Thu, 24 Apr 2008 11:38:15 +0000 (12:38 +0100)]
draw: handle edgeflags and reset-line-stipple again
Keith Whitwell [Thu, 24 Apr 2008 11:36:04 +0000 (12:36 +0100)]
xlib: only shortcircuit makecurrent if NO_RAST set, otherwise window size updates fail
Michel Dänzer [Thu, 24 Apr 2008 09:12:07 +0000 (10:12 +0100)]
gallium: Initial support for pixel formats with unused storage components.
Also clarify that RGB formats with no (used) alpha component are treated as
having alpha = 1.0.
Brian Paul [Thu, 24 Apr 2008 00:09:20 +0000 (18:09 -0600)]
gallium: reorder code to fix a recursive flush
Brian Paul [Thu, 24 Apr 2008 00:08:20 +0000 (18:08 -0600)]
gallium: fix issues in recursive flushing
When flushing/rendering, some stages (like AA line/point) need to set
pipe/driver state. Those driver functions often call draw_flush().
That leads to recursion.
Use new draw->suspend_flush flag to explicitly prevent that in the key places.
Remove the draw->vcache_flushing field.
Reuse draw->flushing as a debug/assertion var.
Brian Paul [Wed, 23 Apr 2008 23:41:30 +0000 (17:41 -0600)]
gallium: fix comments
Brian Paul [Wed, 23 Apr 2008 23:40:39 +0000 (17:40 -0600)]
gallium: fix comments, whitespace changes
Patrice Mandin [Wed, 23 Apr 2008 20:38:49 +0000 (22:38 +0200)]
nv30: add stuff to init swtnl
Brian Paul [Wed, 23 Apr 2008 18:11:00 +0000 (12:11 -0600)]
gallium: passthrough tri, not point
Zack Rusin [Wed, 23 Apr 2008 18:07:53 +0000 (14:07 -0400)]
Add translate cache to fetch_emit stage and add out of memory
checks to code creating the cache.
Zack Rusin [Wed, 23 Apr 2008 18:00:13 +0000 (14:00 -0400)]
Create a sharable translate_cache and use it.
Brian Paul [Wed, 23 Apr 2008 17:37:49 +0000 (11:37 -0600)]
gallium: fix potential divide by zero in fog computation
It's legal for Fog.Start == Fog.End and conformance testing does so.
Brian Paul [Wed, 23 Apr 2008 17:36:47 +0000 (11:36 -0600)]
gallium: additional debug code
Brian Paul [Wed, 23 Apr 2008 17:24:42 +0000 (11:24 -0600)]
gallium: move logicop test outside of loop
Brian Paul [Wed, 23 Apr 2008 17:23:12 +0000 (11:23 -0600)]
gallium: fix broken PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE
Brian Paul [Wed, 23 Apr 2008 17:22:18 +0000 (11:22 -0600)]
gallium: more vertex debug code
Zack Rusin [Wed, 23 Apr 2008 17:32:41 +0000 (13:32 -0400)]
fix the simple hash finding function and use it
José Fonseca [Wed, 23 Apr 2008 17:13:31 +0000 (02:13 +0900)]
gallium: Fix texture refcount leak.
José Fonseca [Wed, 23 Apr 2008 16:59:57 +0000 (01:59 +0900)]
pipebuffer: New function to flush the buffer cache.
José Fonseca [Wed, 23 Apr 2008 15:10:51 +0000 (00:10 +0900)]
gallium: Add extern "C" to the headers.
Brian Paul [Wed, 23 Apr 2008 16:29:52 +0000 (10:29 -0600)]
gallium: fix broken hashing for vertex translation
It seems we get hash collisions fairly easily and the code as it was didn't
deal with that properly.
I think we need a simpler hashing interface...
Keith Whitwell [Wed, 23 Apr 2008 12:56:05 +0000 (13:56 +0100)]
draw: remove stupid debug (Keith)
Keith Whitwell [Wed, 23 Apr 2008 12:51:50 +0000 (13:51 +0100)]
draw: add missing break (Jakob)
Keith Whitwell [Wed, 23 Apr 2008 12:10:13 +0000 (13:10 +0100)]
mesa: add dedicated point-wide-smooth test, restore original tri.c as tri-orig.c
Ben Skeggs [Wed, 23 Apr 2008 02:41:42 +0000 (12:41 +1000)]
nouveau: fix build
Ben Skeggs [Wed, 23 Apr 2008 02:39:38 +0000 (12:39 +1000)]
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Wed, 23 Apr 2008 02:38:37 +0000 (12:38 +1000)]
fix non-i386 builds
Brian Paul [Wed, 23 Apr 2008 01:11:59 +0000 (19:11 -0600)]
gallium: added a flushing_vcache flag, test in draw_do_flush()
Fixes broken polygon stipple, aaline, aapoint stages
Brian Paul [Wed, 23 Apr 2008 01:10:52 +0000 (19:10 -0600)]
gallium: fix bad logic in bind_pstip_fragment_shader(): use &&, not ||
Brian Paul [Wed, 23 Apr 2008 00:38:37 +0000 (18:38 -0600)]
gallium: fix some bitmap frag shader issues
If texturing happens to be enabled when glBitmap() is called, need to be
careful about choosing a sampler unit, etc.
Brian Paul [Wed, 23 Apr 2008 00:38:13 +0000 (18:38 -0600)]
gallium: don't set buffer status to undefined in display_front_buffer()
Zack Rusin [Tue, 22 Apr 2008 22:32:29 +0000 (18:32 -0400)]
In case the 'func' is deleting the state move the iterator before
calling it.
Zack Rusin [Tue, 22 Apr 2008 22:30:31 +0000 (18:30 -0400)]
Fix a crash. Rasterizer can be null
Zack Rusin [Tue, 22 Apr 2008 22:20:34 +0000 (18:20 -0400)]
Cache translate's structs for emits and fetches.
Results in a fair speed improvement.
Zack Rusin [Tue, 22 Apr 2008 22:11:58 +0000 (18:11 -0400)]
Fix reporting of clipped vertices.
Brian Paul [Tue, 22 Apr 2008 22:29:48 +0000 (16:29 -0600)]
gallium: setup an identity viewport
This fixes broken blits.
Brian Paul [Tue, 22 Apr 2008 22:25:55 +0000 (16:25 -0600)]
gallium: update comment about bypass clipping/viewport
Brian Paul [Tue, 22 Apr 2008 22:22:21 +0000 (16:22 -0600)]
gallium: setup an identity viewport
Brian Paul [Tue, 22 Apr 2008 22:15:49 +0000 (16:15 -0600)]
gallium: move the vertex print/debug code
Brian Paul [Tue, 22 Apr 2008 20:42:36 +0000 (14:42 -0600)]
gallium: remove assertions
It's possible the current vs/fs is null when cso_save_vertex/fragment_shader()
is called.
Brian Paul [Tue, 22 Apr 2008 20:41:32 +0000 (14:41 -0600)]
gallium: st_translate_fragment_program() is void now
The return value was never used.
Keith Whitwell [Tue, 22 Apr 2008 20:17:21 +0000 (21:17 +0100)]
Revert "softpipe: squash warning"
This reverts commit
1f0f029ba6f22ef4ada01fcdc153da91571a7963.
Which broke the debug build.
Keith Whitwell [Tue, 22 Apr 2008 19:50:20 +0000 (20:50 +0100)]
draw: allow drivers to query pipeline state more easily
Also, provide a separate flag to say whether the driver can handle
clipping/rhw tasks, in addition to the API flag which indicates they
have already been done.
Keith Whitwell [Tue, 22 Apr 2008 19:32:22 +0000 (20:32 +0100)]
softpipe: squash warning
Keith Whitwell [Tue, 22 Apr 2008 14:26:38 +0000 (15:26 +0100)]
cso: fix vs/fs confusion
Keith Whitwell [Tue, 22 Apr 2008 14:15:21 +0000 (15:15 +0100)]
softpipe: do something sensible on an error path, squash warning
Michel Dänzer [Tue, 22 Apr 2008 13:22:11 +0000 (14:22 +0100)]
gallium: How about restoring shaders instead of saving them again...
Michel Dänzer [Tue, 22 Apr 2008 11:18:31 +0000 (12:18 +0100)]
gallium: Don't link x86sse.c into libmesa.a.
Otherwise we get a symbol clash with the copy in src/gallium/util .
José Fonseca [Tue, 22 Apr 2008 10:47:02 +0000 (19:47 +0900)]
pipebuffer: Temporarily allow simultaneous CPU writes.
Also, fast path for re-fencing the same buffer multiple times with the same fence.
Keith Whitwell [Tue, 22 Apr 2008 10:26:07 +0000 (11:26 +0100)]
draw: disable broken edgeflag code - didn't work & was killing performance
Keith Whitwell [Tue, 22 Apr 2008 10:15:51 +0000 (11:15 +0100)]
xlib: shortcircuit no-op makecurrent
Keith Whitwell [Tue, 22 Apr 2008 10:01:56 +0000 (11:01 +0100)]
xlib: implement SP_NO_RAST env var
Keith Whitwell [Tue, 22 Apr 2008 10:01:41 +0000 (11:01 +0100)]
softpipe: implement SP_NO_RAST env var