Ben Skeggs [Tue, 26 Feb 2008 13:34:31 +0000 (00:34 +1100)]
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Michal Krol [Tue, 26 Feb 2008 10:49:25 +0000 (11:49 +0100)]
gallium: Fix build on Windows.
Zack Rusin [Tue, 26 Feb 2008 06:48:01 +0000 (01:48 -0500)]
implement cache limits for cso
by default set to 4096, which might be on the large side
Zack Rusin [Tue, 26 Feb 2008 05:18:54 +0000 (00:18 -0500)]
add an explicit callback decleration and use it to silence warnings
Zack Rusin [Tue, 26 Feb 2008 05:15:55 +0000 (00:15 -0500)]
hide cso cache definition and add some initial code for size limiting
the caches
Zack Rusin [Tue, 26 Feb 2008 03:03:58 +0000 (22:03 -0500)]
implement deleting of driver side cached state in cso's
Brian [Tue, 26 Feb 2008 01:56:03 +0000 (18:56 -0700)]
gallium: rewrite AA point fragment shader to use a CMP instruction instead of IF/ELSE/ENDIF
Allows the shader to work on i915 hardware.
Brian [Tue, 26 Feb 2008 01:53:57 +0000 (18:53 -0700)]
gallium/i915: plug in aapoint draw stage
Brian [Tue, 26 Feb 2008 01:53:22 +0000 (18:53 -0700)]
gallium/i915: Fix emit_hw_vertex(): need to use vinfo->src_index[]
Brian [Tue, 26 Feb 2008 01:00:14 +0000 (18:00 -0700)]
gallium/i915: remove debug code
Brian [Tue, 26 Feb 2008 00:59:51 +0000 (17:59 -0700)]
gallium/i915: fix i915_emit_texld() to handle swizzled texcoords
Allocate a temporary register, insert MOV instruction, etc.
Ian Romanick [Tue, 26 Feb 2008 00:15:59 +0000 (16:15 -0800)]
cell: Additional changes to match changes in draw/draw_vertex_shader.c
Ian Romanick [Sat, 23 Feb 2008 01:51:55 +0000 (17:51 -0800)]
cell: Fix off-by-one error in spu_dcache_fetch_unaligned
This time the off-by-one error caused an extra qword to be fetched
under certain circumstances when the source ea was not qword aligned.
Ian Romanick [Sat, 23 Feb 2008 00:27:39 +0000 (16:27 -0800)]
cell: Trivial compiler warning clean-ups.
Ian Romanick [Fri, 22 Feb 2008 00:41:12 +0000 (16:41 -0800)]
Cell: Remove unnecessary include files
Ian Romanick [Thu, 21 Feb 2008 19:01:35 +0000 (11:01 -0800)]
Cell: Use multiple DMA tags for the dcache.
Brian [Tue, 26 Feb 2008 00:01:20 +0000 (17:01 -0700)]
gallium/i915: compute vertex size _after_ state validation in emit_prim().
Fixes crash when drawing aa lines.
Brian [Mon, 25 Feb 2008 23:26:37 +0000 (16:26 -0700)]
Added line smooth test
Brian [Mon, 25 Feb 2008 23:25:24 +0000 (16:25 -0700)]
gallium: clamp line width when creating raster state object
Brian [Mon, 25 Feb 2008 23:24:47 +0000 (16:24 -0700)]
gallium/i915: plug in aaline draw stage
Brian [Mon, 25 Feb 2008 23:22:58 +0000 (16:22 -0700)]
gallium/i915: make sure state is up to date in i915_vbuf_render_get_vertex_info(), also disable bogus assertion
Brian [Mon, 25 Feb 2008 23:20:04 +0000 (16:20 -0700)]
gallium/i915: need to recompute vertex info if vertex shader changes
Brian [Mon, 25 Feb 2008 23:16:07 +0000 (16:16 -0700)]
gallium/i915: call draw_flush() in i915_flush()
Brian [Mon, 25 Feb 2008 22:34:46 +0000 (15:34 -0700)]
gallium: fix bad ptr assignment
Brian [Mon, 25 Feb 2008 21:48:31 +0000 (14:48 -0700)]
gallium/i915: use draw_find_vs_output() directly, fix broken fogcoords.
We now produce the correct 915 vertex layout regardless of the order in
which fragment shader inputs are declared.
Brian [Mon, 25 Feb 2008 21:47:13 +0000 (14:47 -0700)]
softpipe: use draw_find_vs_output() directly
Brian [Mon, 25 Feb 2008 21:46:42 +0000 (14:46 -0700)]
gallium: modify draw_find_vs_output() to search vertex shader outputs
This simplifies drivers using the draw module and removes the last dependency
on vertex-shader "internals". Since the draw module is producing the
post-transformed vertices, it makes sense to ask it where specific vertex
attributes are located.
This could also simplify some things in the state tracker code for selection,
feedback, rasterpos...
Brian [Mon, 25 Feb 2008 18:21:03 +0000 (11:21 -0700)]
gallium/i915: Use hardware rendering, unless INTEL_SP env var is set
Brian [Mon, 25 Feb 2008 18:13:58 +0000 (11:13 -0700)]
gallium/i915: added SGT/SLE opcodes
José Fonseca [Mon, 25 Feb 2008 11:05:41 +0000 (20:05 +0900)]
Make the pipe headers C++ friendly.
José Fonseca [Mon, 25 Feb 2008 08:55:45 +0000 (17:55 +0900)]
Get more debugging info out of MSVC.
José Fonseca [Mon, 25 Feb 2008 08:11:28 +0000 (17:11 +0900)]
Remove files of unsupported build systems.
José Fonseca [Mon, 25 Feb 2008 08:05:15 +0000 (17:05 +0900)]
Update git ignores.
José Fonseca [Mon, 25 Feb 2008 07:39:39 +0000 (16:39 +0900)]
Replace standand library functions by portable ones.
José Fonseca [Mon, 25 Feb 2008 06:18:33 +0000 (15:18 +0900)]
Add Zack's comments about CSOs.
José Fonseca [Mon, 25 Feb 2008 05:46:53 +0000 (14:46 +0900)]
Cleanup scons files.
Ben Skeggs [Mon, 25 Feb 2008 02:33:08 +0000 (13:33 +1100)]
nv40: remove pipe_state struct now.
Ben Skeggs [Mon, 25 Feb 2008 02:29:16 +0000 (13:29 +1100)]
nv40: construct vbo state the same way as the rest
Ben Skeggs [Mon, 25 Feb 2008 01:26:48 +0000 (12:26 +1100)]
nv40: dump meaningful names for surface formats
José Fonseca [Sun, 24 Feb 2008 08:58:18 +0000 (17:58 +0900)]
Update some msvc compiler flags.
José Fonseca [Sun, 24 Feb 2008 08:58:05 +0000 (17:58 +0900)]
Add new files.
José Fonseca [Sun, 24 Feb 2008 07:43:07 +0000 (16:43 +0900)]
A few more tweaks to get correct WINDDK compilation.
José Fonseca [Sat, 23 Feb 2008 17:46:46 +0000 (02:46 +0900)]
gallium: Fix MSVC warnings.
Brian [Sat, 23 Feb 2008 23:17:17 +0000 (16:17 -0700)]
gallium: disable early Z test if fragment shader contains KIL instruction.
Use tgsi_scan_shader() to determine if the fragment shader uses KIL or
writes fragment.z
Brian [Sat, 23 Feb 2008 23:15:54 +0000 (16:15 -0700)]
gallium: added TGSI_FILE_COUNT
Brian [Sat, 23 Feb 2008 23:15:29 +0000 (16:15 -0700)]
gallium: added new tgsi_scan.c / tgsi_scan_shader() function
Used to get information about registers, instructions used in a shader.
José Fonseca [Sat, 23 Feb 2008 17:16:28 +0000 (02:16 +0900)]
gallium: MSVC fixes.
José Fonseca [Sat, 23 Feb 2008 10:49:08 +0000 (19:49 +0900)]
Revamp scons usage.
José Fonseca [Sat, 23 Feb 2008 05:14:54 +0000 (14:14 +0900)]
Bring in several forgotten MSVC fixes.
José Fonseca [Sat, 23 Feb 2008 05:14:20 +0000 (14:14 +0900)]
Fix typo.
Brian [Sat, 23 Feb 2008 01:34:31 +0000 (18:34 -0700)]
gallium: fix a state validation bug found w/ pointblast.c
Brian [Sat, 23 Feb 2008 00:22:10 +0000 (17:22 -0700)]
gallium: fix bug in which wide point stage overrode the aapoint stage
Also, simplify the logic a bit.
Brian [Fri, 22 Feb 2008 23:48:05 +0000 (16:48 -0700)]
gallium/i915: overhaul of fragment shader compilation, constant/immediate allocation
Before, fragment shaders were translated to i915 hw code at bind time, rather
than create time. Now there's an i915_fragment_shader struct with the expected
contents that's created by i915_create_fs_state(). Translation to i915 code
takes place there too.
Immediates are handled correctly now. During program translation we keep
track of which constant buffer slots are free (i.e. not referenced by the
shader). Then the TGSI immediates and ancillary immediates (introduced for
SIN/COS/etc) are put into those free slots.
When it's time to upload the constant buffer, use the fp->constant_flags[]
array to determine if we should grab an immediate from the shader, or a
user-defined parameter from the gallium constant buffer.
Brian [Fri, 22 Feb 2008 21:07:33 +0000 (14:07 -0700)]
i915: include stdio.h
Brian [Fri, 22 Feb 2008 21:07:12 +0000 (14:07 -0700)]
i915: include p_debug.h (resolves undefined assert())
Brian [Fri, 22 Feb 2008 15:56:55 +0000 (08:56 -0700)]
gallium: fix brokenb build
Brian [Fri, 22 Feb 2008 15:52:24 +0000 (08:52 -0700)]
cell: added function prototypes to silence warnings
Brian [Fri, 22 Feb 2008 15:50:37 +0000 (08:50 -0700)]
cell: fix build: s/dest/vertex/
José Fonseca [Fri, 22 Feb 2008 09:45:20 +0000 (18:45 +0900)]
gallium: Countour MSVC's pickyness for structures returned by value.
José Fonseca [Fri, 22 Feb 2008 09:28:30 +0000 (18:28 +0900)]
gallium: Wrap decls in extern "C".
José Fonseca [Fri, 22 Feb 2008 08:22:32 +0000 (17:22 +0900)]
gallium: Add cso convenience routine (from Keith's patch).
José Fonseca [Fri, 22 Feb 2008 07:22:41 +0000 (16:22 +0900)]
gallium: MSVC fixes.
Michal Krol [Wed, 20 Feb 2008 21:25:18 +0000 (22:25 +0100)]
gallium: Fix build on Windows.
Michal Krol [Wed, 20 Feb 2008 21:10:27 +0000 (22:10 +0100)]
gallium: Silence compiler warnings on Windows.
Michal Krol [Wed, 20 Feb 2008 21:05:52 +0000 (22:05 +0100)]
gallium: Silence compiler warnings on Windows.
Michal Krol [Wed, 20 Feb 2008 21:05:06 +0000 (22:05 +0100)]
gallium: Define intptr_t for Windows platform.
Michal Krol [Wed, 20 Feb 2008 21:04:32 +0000 (22:04 +0100)]
gallium: Move align_pointer() to p_pointer.h.
Michal Krol [Wed, 20 Feb 2008 21:03:59 +0000 (22:03 +0100)]
gallium: New file.
José Fonseca [Fri, 22 Feb 2008 15:46:40 +0000 (00:46 +0900)]
Avoid building problematic module/drivers on windows.
José Fonseca [Wed, 20 Feb 2008 09:57:45 +0000 (18:57 +0900)]
Don't parse mesa's rtasm asm module.
Ben Skeggs [Fri, 22 Feb 2008 03:46:48 +0000 (14:46 +1100)]
nv40: stateobj start out with 0 refcount
Ben Skeggs [Fri, 22 Feb 2008 02:55:18 +0000 (13:55 +1100)]
nv40: move hw_dirty
Ben Skeggs [Fri, 22 Feb 2008 02:32:51 +0000 (13:32 +1100)]
nv40: rework fragment texture state
Ben Skeggs [Fri, 22 Feb 2008 01:36:48 +0000 (12:36 +1100)]
nouveau: fix build
Ben Skeggs [Fri, 22 Feb 2008 01:25:15 +0000 (12:25 +1100)]
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
src/gallium/drivers/Makefile
Brian [Thu, 21 Feb 2008 23:56:32 +0000 (16:56 -0700)]
gallium: new draw stage for polygon stipple.
For hardware without native polygon stipple. Create a 32x32 alpha texture
that encodes the stipple pattern. Modify the user's fragment program to
sample the texture (with gl_FragCoord) and kill the fragment according to
the texel value.
Temporarily enabled in softpipe driver, replacing the sp_quad_stipple.c step.
Brian [Thu, 21 Feb 2008 23:18:05 +0000 (16:18 -0700)]
gallium: new AA point drawing stage
AA points are drawn by converting the point to a quad, then modifying the
user's fragment shader to compute a coverage value. The final fragment
color's alpha is modulated by the coverage value. Fragments outside the
point's radius are killed.
Brian [Thu, 21 Feb 2008 19:32:38 +0000 (12:32 -0700)]
gallium: fill in some blend/rasterizer template fields to make sure they're all valid, even if not relevant
Brian [Thu, 21 Feb 2008 15:37:49 +0000 (08:37 -0700)]
gallium: comments, white-space clean-up
Keith Whitwell [Thu, 21 Feb 2008 19:07:31 +0000 (19:07 +0000)]
[PATCH] softpipe: unbreak sp_setup_pos_vector on non-x86 systems
Keith Whitwell [Thu, 21 Feb 2008 10:07:58 +0000 (10:07 +0000)]
[PATCH] gallium: include p_compiler.h for boolean defn
Keith Whitwell [Fri, 15 Feb 2008 18:56:41 +0000 (18:56 +0000)]
draw: vertex cache rework
Take a baby step to straightening out vertex paths.
Keith Whitwell [Fri, 15 Feb 2008 18:54:00 +0000 (18:54 +0000)]
tgsi: print debug messages on failure to codegenerate
Ian Romanick [Thu, 21 Feb 2008 18:32:02 +0000 (10:32 -0800)]
Cell: Remove erroneous ALIGN16_ATTRIB attributes
If a structure is marked as being aligned the SPE compiler performs
extra optimizations (sadly, only -O2 is used) when reading the
structure. Since most of the structures sent in batch buffers are
only 8-byte aligned, this resulted in mysterous bugs with -O2.
Ian Romanick [Thu, 21 Feb 2008 18:24:29 +0000 (10:24 -0800)]
Cell: Add spu_dcache.c to Makefile.
This was erroneously missing in previous commits.
Ian Romanick [Thu, 21 Feb 2008 17:03:29 +0000 (09:03 -0800)]
Cell: Initial scalar implementation of spu_dcache_mark_dirty
Ian Romanick [Wed, 20 Feb 2008 22:45:08 +0000 (14:45 -0800)]
Cell: Fix off-by-one error in spu_dcache_fetch_unaligned
An off-by-one error caused an extra qword to be fetched under certain
alignment / size combinations.
Ian Romanick [Wed, 20 Feb 2008 22:32:25 +0000 (14:32 -0800)]
Cell: Initial pass at unified data cache
Brian [Thu, 21 Feb 2008 01:00:03 +0000 (18:00 -0700)]
gallium: include p_inlines.h
Brian [Thu, 21 Feb 2008 00:57:40 +0000 (17:57 -0700)]
gallium: s/pipe_reference_texture/pipe_texture_reference/
Brian [Wed, 20 Feb 2008 22:32:41 +0000 (15:32 -0700)]
gallium: re-fix some msvc warnings
Brian [Wed, 20 Feb 2008 22:13:33 +0000 (15:13 -0700)]
cell: use pipe_texture_reference()
Brian [Wed, 20 Feb 2008 22:09:27 +0000 (15:09 -0700)]
gallium: replace some ordinary assignments with pipe_reference_texture()
This fixes at least one instance of dereferencing an invalid texture pointer.
Brian [Wed, 20 Feb 2008 21:44:15 +0000 (14:44 -0700)]
gallium: fix bad ptr comparison
Brian [Wed, 20 Feb 2008 21:32:43 +0000 (14:32 -0700)]
cell: rename cell_state_fs.c -> cell_state_shader.c
Brian [Wed, 20 Feb 2008 21:30:50 +0000 (14:30 -0700)]
cell: init shader-related functions in cell_init_shader_functions()
Brian [Wed, 20 Feb 2008 21:27:08 +0000 (14:27 -0700)]
cell: #includes to silence warnings
Brian [Wed, 20 Feb 2008 21:25:07 +0000 (14:25 -0700)]
cell: plug in cell_set_sampler_texture
Brian [Wed, 20 Feb 2008 21:24:46 +0000 (14:24 -0700)]
Remove obsolete files replaced by cell_pipe_state.c
Brian [Wed, 20 Feb 2008 21:21:45 +0000 (14:21 -0700)]
cell: put most simple state-setter functions in new cell_pipe_state.c file
Also, re-org of texture/surface functions.