Patrice Mandin [Fri, 22 Feb 2008 16:18:27 +0000 (17:18 +0100)]
nv30: wrong number of parameters
Ben Skeggs [Sat, 16 Feb 2008 06:51:44 +0000 (17:51 +1100)]
nouveau: fix potential userbuf crash.
Ben Skeggs [Sat, 16 Feb 2008 06:23:12 +0000 (17:23 +1100)]
nouveau: match gallium code reorginisation.
That was... fun..
Ben Skeggs [Sat, 16 Feb 2008 05:30:22 +0000 (16:30 +1100)]
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
Ben Skeggs [Sat, 16 Feb 2008 05:20:40 +0000 (16:20 +1100)]
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/nouveau/nouveau_stateobj.h
src/mesa/pipe/nv40/nv40_context.c
src/mesa/pipe/nv40/nv40_miptree.c
Stephane Marchesin [Sat, 16 Feb 2008 02:04:28 +0000 (03:04 +0100)]
nv30: fixes.
Stephane Marchesin [Sat, 16 Feb 2008 01:54:11 +0000 (02:54 +0100)]
nv30: fixes.
Ian Romanick [Fri, 15 Feb 2008 19:03:54 +0000 (11:03 -0800)]
Cell: Enable code gen for SPE attribute fetch
Doubles are still unsupported.
Ian Romanick [Fri, 15 Feb 2008 18:36:48 +0000 (10:36 -0800)]
Cell: Add missing back-slash in linux-cell config file
Ian Romanick [Fri, 15 Feb 2008 18:33:12 +0000 (10:33 -0800)]
Cell: Add INCLUDE_DIRS to SPU_CFLAGS to fix build.
Ian Romanick [Fri, 15 Feb 2008 18:00:31 +0000 (10:00 -0800)]
Make this file build on non-SSE builds (e.g., Cell)
Ian Romanick [Fri, 15 Feb 2008 17:43:13 +0000 (09:43 -0800)]
Move cell_vertex_fetch.c for recent code reorg.
Ian Romanick [Fri, 15 Feb 2008 02:30:48 +0000 (18:30 -0800)]
Initial version of code gen for attribute fetch
Ian Romanick [Fri, 15 Feb 2008 02:29:51 +0000 (18:29 -0800)]
Correct the convert to and from float instructions
Ben Skeggs [Fri, 15 Feb 2008 15:42:06 +0000 (02:42 +1100)]
nv40: over-zealous s/
Ben Skeggs [Fri, 15 Feb 2008 15:30:56 +0000 (02:30 +1100)]
nv40: fix non-debug builds + start on obeying portability guidelines.
Keith Whitwell [Fri, 15 Feb 2008 13:39:24 +0000 (13:39 +0000)]
tgsi: pass through failure to sse-codegenerate for fragment programs too.
In particular, will fallback to interpreted execution for shaders with
TEX instructions.
Keith Whitwell [Fri, 15 Feb 2008 13:37:01 +0000 (13:37 +0000)]
draw: subclass vertex shaders according to execution method
Create new files for shaders compiled/executed with llvm, sse, exec
respectively
Keith Whitwell [Fri, 15 Feb 2008 13:35:46 +0000 (13:35 +0000)]
softpipe: rename some functions to disambiguate
Keith Whitwell [Fri, 15 Feb 2008 11:18:04 +0000 (11:18 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.1
Keith Whitwell [Fri, 15 Feb 2008 11:15:47 +0000 (11:15 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.1
Conflicts:
src/gallium/drivers/softpipe/sp_quad_fs.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/softpipe/sp_state_fs.c
José Fonseca [Fri, 15 Feb 2008 11:11:40 +0000 (20:11 +0900)]
Code reorganization: s/aux/auxiliary/ -- update build.
José Fonseca [Fri, 15 Feb 2008 11:07:18 +0000 (20:07 +0900)]
Code reorganization: s/aux/auxiliary/.
"aux" is a reserved name on Windows (X_X)
Keith Whitwell [Fri, 15 Feb 2008 09:31:22 +0000 (09:31 +0000)]
gallium: reorganize fragment shader execution, unbreak sse
This is probably going to get further reworked in the near future.
Right now there's a new interface wrapped around each shader execution
mode - exec, sse2, llvm. The llvm code was disabled already and has
just been moved as-is to a new file, whereas the sse2 and exec code is
actually enabled.
The way the interfaces has turned out suggests to me that the correct
approach is to actually have each shader include a pointer to a quad stage
which will do a better job of encapsulating the execution environment than
what I have here -- that's a second step however.
Keith Whitwell [Fri, 15 Feb 2008 08:56:04 +0000 (08:56 +0000)]
tgsi: disable dummy sse2 texture code
José Fonseca [Fri, 15 Feb 2008 08:52:14 +0000 (17:52 +0900)]
Code reorganization: placeholder for state-trackers.
This is meant for temporarily holding state-trackers,
until they eventually find their way out of gallium tree.
José Fonseca [Fri, 15 Feb 2008 08:50:12 +0000 (17:50 +0900)]
Code reorganization: update build.
Update the Makefiles and includes for the new paths.
Note that there hasn't been no separation of the Makefiles yet, and make is
jumping all over the place. That will be taken care shortly. But for now, make
should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm
might require some minor tweaks.
José Fonseca [Fri, 15 Feb 2008 08:35:24 +0000 (17:35 +0900)]
Code reorganization: move files into their places.
This is in a separate commit to ensure renames are properly preserved.
Zack Rusin [Fri, 15 Feb 2008 05:36:18 +0000 (00:36 -0500)]
vastly simplify indexing
Zack Rusin [Fri, 15 Feb 2008 04:50:39 +0000 (23:50 -0500)]
redo indirection
make all load's respect indirection
Zack Rusin [Fri, 15 Feb 2008 03:42:57 +0000 (22:42 -0500)]
redo the way immediates are handled
implement madd
start implementing arl
Zack Rusin [Thu, 14 Feb 2008 08:08:48 +0000 (03:08 -0500)]
rename 'argument' to 'load' because that's what it does
Zack Rusin [Thu, 14 Feb 2008 03:53:00 +0000 (22:53 -0500)]
implement swizzling on writes
Zack Rusin [Fri, 15 Feb 2008 06:11:15 +0000 (01:11 -0500)]
a call was missed during the last rename
Stephane Marchesin [Fri, 15 Feb 2008 03:23:46 +0000 (04:23 +0100)]
nouveau: more nv30 fixes, still doesn't work as well as before.
Stephane Marchesin [Fri, 15 Feb 2008 02:48:32 +0000 (03:48 +0100)]
nouveau: nv30 fixes.
Ben Skeggs [Fri, 15 Feb 2008 02:55:55 +0000 (13:55 +1100)]
nv30: more interface updates
Ben Skeggs [Fri, 15 Feb 2008 02:54:07 +0000 (13:54 +1100)]
nv30: fix build
Ben Skeggs [Thu, 14 Feb 2008 13:14:15 +0000 (00:14 +1100)]
nv40: always copy 4 float immediates for now.
Ben Skeggs [Wed, 13 Feb 2008 08:33:41 +0000 (19:33 +1100)]
nv40: attempt at obeying sampler min_lod/max_lod/lod_bias
Ben Skeggs [Wed, 13 Feb 2008 03:27:32 +0000 (14:27 +1100)]
nv40: remove use of pt->first_level
Brian [Wed, 13 Feb 2008 02:14:58 +0000 (19:14 -0700)]
gallium: initial code for wide/AA line drawing
Brian [Wed, 13 Feb 2008 00:44:57 +0000 (17:44 -0700)]
gallium: fix/finish glReadPixels(GL_DEPTH_COMPONENT).
This fixes demos/reflect ('d' key) and tests/zreaddraw.c
Brian [Wed, 13 Feb 2008 00:07:27 +0000 (17:07 -0700)]
gallium: clamp min_lod so it's never negative
Brian [Tue, 12 Feb 2008 23:56:18 +0000 (16:56 -0700)]
Fix broken test.
As-is, if the texture was too large for the target, an assertion would fail.
Now check proxy texture first and if it works, then test non-proxy target.
Brian [Tue, 12 Feb 2008 23:38:56 +0000 (16:38 -0700)]
gallium: remove dead code
Brian [Tue, 12 Feb 2008 23:37:49 +0000 (16:37 -0700)]
gallium: added null ptr check
Brian [Tue, 12 Feb 2008 23:10:11 +0000 (16:10 -0700)]
gallium: rename st_fragment_program's fs field to cso to match st_vertex_program
Brian [Tue, 12 Feb 2008 23:06:51 +0000 (16:06 -0700)]
gallium: move gen-mipmap global/static vars into st_context
This fixes potential problems with multi-context programs.
Brian [Tue, 12 Feb 2008 22:53:37 +0000 (15:53 -0700)]
Set Min/MaxLod with glTexParameterf, not glTexParameteri
Brian [Mon, 11 Feb 2008 16:46:10 +0000 (09:46 -0700)]
press 0,1,2,etc keys for specific bias values
Brian [Tue, 12 Feb 2008 21:59:07 +0000 (14:59 -0700)]
tweak incr/decrements amounts for keyboard options
Brian [Tue, 12 Feb 2008 21:55:51 +0000 (14:55 -0700)]
gallium: remove unused first_level param from st_texture_create()
Brian [Tue, 12 Feb 2008 21:53:25 +0000 (14:53 -0700)]
gallium: clean-up, simplification of mipmapped textures
Remove pipe_texture->first_level (always implicitly zero). This means there's
never any unused mipmap levels at the top.
In the state tracker, we no longer re-layout mipmapped textures if the
MinLod/MaxLod texture parameters change. It's up to the driver to obey the
pipe_sampler->min/max_lod clamps.
Ben Skeggs [Tue, 12 Feb 2008 04:13:37 +0000 (15:13 +1100)]
nv40: fix inline u08/u16 indices
Brian [Mon, 11 Feb 2008 17:59:40 +0000 (10:59 -0700)]
gallium: take pitch/stride into account in mipmap generation
Brian [Mon, 11 Feb 2008 16:50:21 +0000 (09:50 -0700)]
gallium: comments about mipmap gen
Brian [Mon, 11 Feb 2008 16:43:30 +0000 (09:43 -0700)]
code refactoring, new next_mipmap_level_size() function
Brian [Mon, 11 Feb 2008 16:42:02 +0000 (09:42 -0700)]
gallium: implement software fallback for mipmap generation
This is used when we can't render to the surface type of the texture (such
as luminance/alpha).
Brian [Mon, 11 Feb 2008 16:38:36 +0000 (09:38 -0700)]
gallium: strip borders from textures passed to st_TexImage.
Manipulate the unpack params to skip the border. Gallium drivers won't support
texture borders.
Brian [Mon, 11 Feb 2008 16:35:28 +0000 (09:35 -0700)]
gallium: use _mesa_tex_target_to_face()
Brian [Mon, 11 Feb 2008 16:33:28 +0000 (09:33 -0700)]
added _mesa_tex_target_to_face()
Brian [Mon, 11 Feb 2008 15:56:18 +0000 (08:56 -0700)]
gallium: update comment about buffer map flags
Brian [Mon, 11 Feb 2008 15:18:43 +0000 (08:18 -0700)]
gallium: fix fragment/vertex typo
Brian [Fri, 8 Feb 2008 23:56:21 +0000 (16:56 -0700)]
refactor code, export _mesa_generate_mipmap_level()
Brian [Fri, 8 Feb 2008 23:46:12 +0000 (16:46 -0700)]
move _mesa_format_to_type_and_comps() to texformat.c
Brian [Fri, 8 Feb 2008 23:42:50 +0000 (16:42 -0700)]
reorder cases in do_row()
Brian [Fri, 8 Feb 2008 23:40:39 +0000 (16:40 -0700)]
re-indent do_row()
Brian [Fri, 8 Feb 2008 23:38:28 +0000 (16:38 -0700)]
checkpoint- consolidation in do_row()
Brian [Fri, 8 Feb 2008 23:35:44 +0000 (16:35 -0700)]
checkpoint- remove dependencies on gl_texture_format to make code re-usable by state tracker
Zack Rusin [Mon, 11 Feb 2008 15:47:28 +0000 (10:47 -0500)]
remove seperate llvm vs entry points
they're not necessary anymore. we use the same paths
as sse and tgsi code
Zack Rusin [Mon, 11 Feb 2008 14:43:59 +0000 (09:43 -0500)]
start genering soa type code in llvm paths
Zack Rusin [Wed, 6 Feb 2008 11:12:34 +0000 (06:12 -0500)]
disable llvm for fragment shaders for now
Zack Rusin [Tue, 5 Feb 2008 08:09:24 +0000 (03:09 -0500)]
rewrite the way cpu engine is handled
Zack Rusin [Mon, 4 Feb 2008 15:07:02 +0000 (10:07 -0500)]
rewrite the way we handle ir in llvm code
introduce intermediate step gallivm_ir before compiling it
down to the final llvm ir.
Zack Rusin [Fri, 25 Jan 2008 11:36:35 +0000 (06:36 -0500)]
add a stub of a lowering pass
Ben Skeggs [Sun, 10 Feb 2008 04:19:18 +0000 (15:19 +1100)]
nouveau: memory leak
Ben Skeggs [Sun, 10 Feb 2008 04:16:50 +0000 (15:16 +1100)]
nv40: prep for multiple pipe contexts on a single hw channel
Ben Skeggs [Sat, 9 Feb 2008 05:25:29 +0000 (16:25 +1100)]
nouveau: interface updates
Ben Skeggs [Sat, 9 Feb 2008 03:08:54 +0000 (14:08 +1100)]
nv40: delay all state emit until before draw
Brian [Fri, 8 Feb 2008 21:56:38 +0000 (14:56 -0700)]
gallium: include st_cb_drawpixels.h
Brian [Fri, 8 Feb 2008 21:55:33 +0000 (14:55 -0700)]
fix comment typos
Brian [Fri, 8 Feb 2008 21:54:18 +0000 (14:54 -0700)]
gallium: initial implemenation of auto mipmap generation in state tracker
Use hardware rendering to compute/render mipmap levels.
The fallback path (which will be used for non-renderable texture formats)
isn't working yet.
Brian [Fri, 8 Feb 2008 21:51:32 +0000 (14:51 -0700)]
gallium: added inClipCoords param to st_draw_vertices() to indicate coord system of vertices
Also, export st_make_passthrough_vertex_shader() from st_cb_drawpixels.c
Brian [Fri, 8 Feb 2008 21:46:47 +0000 (14:46 -0700)]
gallium: added draw_flush() call in softpipe_bind_sampler_state()
Brian [Fri, 8 Feb 2008 21:45:58 +0000 (14:45 -0700)]
Remove unused texunit parameter to ctx->Driver.GenerateMipmap()
Jerome Glisse [Fri, 8 Feb 2008 17:47:25 +0000 (18:47 +0100)]
intel_winsys: remove leftover code
Jerome Glisse [Fri, 8 Feb 2008 17:25:49 +0000 (18:25 +0100)]
failover: several fixes to failover pipe module
Michel Dänzer [Thu, 7 Feb 2008 19:44:42 +0000 (19:44 +0000)]
tgsi: Fall back to interpreter instead of assert(0) on unimplemented SSE code.
Michel Dänzer [Thu, 7 Feb 2008 19:43:34 +0000 (19:43 +0000)]
pipebuffer: Fix reversed assertion.
José Fonseca [Thu, 7 Feb 2008 10:59:17 +0000 (19:59 +0900)]
gallium: Conditionally use posix libraries/includes.
Brian [Wed, 6 Feb 2008 16:48:56 +0000 (09:48 -0700)]
Cell: silence unused var warnings
Brian [Wed, 6 Feb 2008 16:48:37 +0000 (09:48 -0700)]
gallium: #include p_debug.h since we use assert
Brian [Wed, 6 Feb 2008 16:35:33 +0000 (09:35 -0700)]
Cell: use mem_dup()
Brian [Wed, 6 Feb 2008 16:29:00 +0000 (09:29 -0700)]
gallium: use mem_dup()
Brian [Wed, 6 Feb 2008 16:28:20 +0000 (09:28 -0700)]
gallium: added mem_dup()
Brian [Wed, 6 Feb 2008 16:24:30 +0000 (09:24 -0700)]
gallium: change pipe->texture_create() to operate like the CSO functions
Now, pass in a template object and return a new object.
Brian [Wed, 6 Feb 2008 15:44:19 +0000 (08:44 -0700)]
clean-ups in guess_and_alloc_texture()
Brian [Wed, 6 Feb 2008 01:15:39 +0000 (18:15 -0700)]
plug in ctx->Driver.GenerateMipmap function
Brian [Wed, 6 Feb 2008 01:15:03 +0000 (18:15 -0700)]
Added ctx->Driver.GenerateMipmap() driver hook