mesa.git
16 years agoMerge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Ben Skeggs [Wed, 23 Jan 2008 04:27:00 +0000 (15:27 +1100)]
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

16 years agogallium: use temp reg for storing color to avoid reading 'result.color'
Brian [Wed, 23 Jan 2008 03:52:48 +0000 (20:52 -0700)]
gallium: use temp reg for storing color to avoid reading 'result.color'

16 years agogallium: Don't allocate a vertex buffer until after setting the prim type.
Brian [Tue, 22 Jan 2008 23:37:19 +0000 (16:37 -0700)]
gallium: Don't allocate a vertex buffer until after setting the prim type.

The vertex size may depend on whether we're drawing points, lines or triangles.

16 years agoadded stipple_destroy()
José Fonseca [Tue, 22 Jan 2008 23:35:50 +0000 (16:35 -0700)]
added stipple_destroy()

16 years agogallium: Added FORMAT_1F_PSIZE to insert constant point size into vertices
Brian [Tue, 22 Jan 2008 17:16:30 +0000 (10:16 -0700)]
gallium: Added FORMAT_1F_PSIZE to insert constant point size into vertices

Also, added draw_convert_wide_points/lines() so a driver can tell the draw
module whether to convert wide points/lines into triangles, or just pass
them through.

16 years agogallium: silence warnings
Brian [Tue, 22 Jan 2008 04:19:24 +0000 (21:19 -0700)]
gallium: silence warnings

16 years agoCell: initial support for sampler state
Brian [Tue, 22 Jan 2008 04:15:43 +0000 (21:15 -0700)]
Cell: initial support for sampler state

16 years agoCell: s/cell_init_surface_funcs/cell_init_surface_functions/
Brian [Tue, 22 Jan 2008 03:54:38 +0000 (20:54 -0700)]
Cell: s/cell_init_surface_funcs/cell_init_surface_functions/

16 years agoCell: Added cell_surface.[ch] files
Brian [Tue, 22 Jan 2008 03:53:23 +0000 (20:53 -0700)]
Cell: Added cell_surface.[ch] files

16 years agogallium: remove unneeded protos, #includes, etc
Brian [Tue, 22 Jan 2008 03:51:03 +0000 (20:51 -0700)]
gallium: remove unneeded protos, #includes, etc

16 years agogallium: include sp_headers.h
Brian [Tue, 22 Jan 2008 03:50:39 +0000 (20:50 -0700)]
gallium: include sp_headers.h

16 years agoCell: renamed cell_surface.[ch] to cell_clear.[ch]
Brian [Tue, 22 Jan 2008 03:31:36 +0000 (20:31 -0700)]
Cell: renamed cell_surface.[ch] to cell_clear.[ch]

16 years agoCell: rename cell_surface.[ch] cell_clear.[ch]
Brian [Tue, 22 Jan 2008 03:31:16 +0000 (20:31 -0700)]
Cell: rename cell_surface.[ch] cell_clear.[ch]

16 years agoCell: Add initial texture functions
Brian [Tue, 22 Jan 2008 03:26:40 +0000 (20:26 -0700)]
Cell: Add initial texture functions

16 years agoCell: add cell_set_sampler_texture()
Brian [Tue, 22 Jan 2008 03:25:44 +0000 (20:25 -0700)]
Cell: add cell_set_sampler_texture()

16 years agogallium: move softpipe_get_tex_surface() prototype
Brian [Tue, 22 Jan 2008 03:23:48 +0000 (20:23 -0700)]
gallium: move softpipe_get_tex_surface() prototype

16 years agogallium: add license comment
Brian [Tue, 22 Jan 2008 03:16:13 +0000 (20:16 -0700)]
gallium: add license comment

16 years agogallium: move softpipe_get_tex_surface() into sp_texture.c
Brian [Tue, 22 Jan 2008 03:14:22 +0000 (20:14 -0700)]
gallium: move softpipe_get_tex_surface() into sp_texture.c

16 years agoCell: added asmfiles rule
Brian [Tue, 22 Jan 2008 02:25:10 +0000 (19:25 -0700)]
Cell: added asmfiles rule

16 years agogallium: prototype draw_linestipple.c replaced by draw_stipple.c
Brian [Mon, 21 Jan 2008 22:29:54 +0000 (15:29 -0700)]
gallium: prototype draw_linestipple.c replaced by draw_stipple.c

16 years agogallium: remove per-fragment line stipple code
Brian [Mon, 21 Jan 2008 21:10:16 +0000 (14:10 -0700)]
gallium: remove per-fragment line stipple code

16 years agogallium: new 'draw' stage for line stipple
Brian [Mon, 21 Jan 2008 21:08:20 +0000 (14:08 -0700)]
gallium: new 'draw' stage for line stipple

Stippled lines are converted into a series of shorter line segments

16 years agofix broken point rendering in sp_vbuf_render()
Brian [Mon, 21 Jan 2008 18:37:58 +0000 (11:37 -0700)]
fix broken point rendering in sp_vbuf_render()

16 years agogallium: add a src_index[] array to draw's vertex_info for mapping post-xform vertex...
Brian [Mon, 21 Jan 2008 18:16:22 +0000 (11:16 -0700)]
gallium: add a src_index[] array to draw's vertex_info for mapping post-xform vertex attribs to hw vertex attribs

16 years agoCell: use tile_t for color tile
Brian [Mon, 21 Jan 2008 00:39:07 +0000 (17:39 -0700)]
Cell: use tile_t for color tile

16 years agoCell: clean-up/re-org tile code
Brian [Mon, 21 Jan 2008 00:27:05 +0000 (17:27 -0700)]
Cell: clean-up/re-org tile code

Also, support 16 or 32-bit Z buffer at runtime.

16 years agoCell: use depth/stencil state to enable ztest
Brian [Sun, 20 Jan 2008 22:00:18 +0000 (15:00 -0700)]
Cell: use depth/stencil state to enable ztest

Move z-test code into do_depth_test().
Add ZSIZE symbol to support 2 or 4-byte Z values.

16 years agoenable call to cell_emit_state()
Brian [Sun, 20 Jan 2008 21:58:29 +0000 (14:58 -0700)]
enable call to cell_emit_state()

16 years agonouveau: small oops
Ben Skeggs [Sun, 20 Jan 2008 12:20:42 +0000 (23:20 +1100)]
nouveau: small oops

16 years agonv40: clarify that tex code is fp-only, we'll do vertex textures eventually.
Ben Skeggs [Sun, 20 Jan 2008 00:13:08 +0000 (11:13 +1100)]
nv40: clarify that tex code is fp-only, we'll do vertex textures eventually.

16 years agoMerge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Ben Skeggs [Sat, 19 Jan 2008 23:38:35 +0000 (10:38 +1100)]
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

16 years agoCell: improve "finished copying batch buffer" signalling.
Brian [Sat, 19 Jan 2008 19:04:06 +0000 (12:04 -0700)]
Cell: improve "finished copying batch buffer" signalling.

When the SPU is done copying a batch buffer to local store, use an mfc_put()
to write a "done" message back to the buffer status array in main memory.
We were previously using a mailbox message for synchronization.

16 years agos/varible/variable/
Brian [Fri, 18 Jan 2008 19:47:20 +0000 (12:47 -0700)]
s/varible/variable/

16 years agoset param type to PROGRAM_CONSTANT when parsing immediates
Brian [Fri, 18 Jan 2008 19:45:55 +0000 (12:45 -0700)]
set param type to PROGRAM_CONSTANT when parsing immediates

16 years agouse PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating immediates/literals
Brian [Fri, 18 Jan 2008 19:45:27 +0000 (12:45 -0700)]
use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating immediates/literals

16 years agoUnify copy_rect helpers.
Michel Dänzer [Fri, 18 Jan 2008 18:08:30 +0000 (19:08 +0100)]
Unify copy_rect helpers.

Some of the copies were buggy.

16 years agoRevert "temporarily don't emit TGSI immediates, use the constant buffer"
José Fonseca [Thu, 17 Jan 2008 08:20:46 +0000 (17:20 +0900)]
Revert "temporarily don't emit TGSI immediates, use the constant buffer"

This reverts commit 310e7ca44b33558a9aa22f43024d1bfb63642128.

16 years agoBack-port miscellaneous fixes from internal branch (mostly portability fixes).
José Fonseca [Thu, 17 Jan 2008 04:39:14 +0000 (13:39 +0900)]
Back-port miscellaneous fixes from internal branch (mostly portability fixes).

These are changes that are in our internal branch, but somehow were skipped
so far. It was done using visual comparison of the branches --
it is likely that changes are being carried on the wrong way

16 years agogallium: Pass PIPE_BUFFER_USAGE_PIXEL to buffer_data.
José Fonseca [Thu, 17 Jan 2008 04:37:17 +0000 (13:37 +0900)]
gallium: Pass PIPE_BUFFER_USAGE_PIXEL to buffer_data.

16 years agogallium: Handle TGSI_OPCODE_END on sse2.
José Fonseca [Thu, 17 Jan 2008 02:00:51 +0000 (11:00 +0900)]
gallium: Handle TGSI_OPCODE_END on sse2.

16 years agotemporarily don't emit TGSI immediates, use the constant buffer
Brian [Thu, 17 Jan 2008 00:21:05 +0000 (17:21 -0700)]
temporarily don't emit TGSI immediates, use the constant buffer

This allows a few more programs to run and not crash.
Need to get constant buffer uploads working...

16 years agogallium: Fix cut-n-paste error.
José Fonseca [Tue, 18 Dec 2007 22:19:40 +0000 (22:19 +0000)]
gallium: Fix cut-n-paste error.

16 years agogallium: Alternative mm_bufmgr_create_from_buffer constructor for mm pool managers.
José Fonseca [Tue, 18 Dec 2007 22:01:35 +0000 (22:01 +0000)]
gallium: Alternative mm_bufmgr_create_from_buffer constructor for mm pool managers.

16 years agogallium: Detect if a null buffer is passed.
José Fonseca [Tue, 18 Dec 2007 18:59:49 +0000 (18:59 +0000)]
gallium: Detect if a null buffer is passed.

16 years agogallium: fix warning
Keith Whitwell [Mon, 17 Dec 2007 12:03:51 +0000 (12:03 +0000)]
gallium: fix warning

16 years agogallium: fix warning
Keith Whitwell [Mon, 17 Dec 2007 11:59:02 +0000 (11:59 +0000)]
gallium: fix warning

16 years agogallium: hardwire reset_temps functionality
Keith Whitwell [Fri, 14 Dec 2007 15:51:07 +0000 (15:51 +0000)]
gallium: hardwire reset_temps functionality

16 years agogallium: whitespace changes
Keith Whitwell [Fri, 14 Dec 2007 15:50:06 +0000 (15:50 +0000)]
gallium: whitespace changes

16 years agogallium: Ignore generated files.
José Fonseca [Fri, 14 Dec 2007 16:37:10 +0000 (16:37 +0000)]
gallium: Ignore generated files.

16 years agouse NEGATE_X/Y/Z/W tokens
Brian [Wed, 16 Jan 2008 23:43:50 +0000 (16:43 -0700)]
use NEGATE_X/Y/Z/W tokens

16 years agoclean-up swizzle fields in fog code, fix NegateBase
Brian [Wed, 16 Jan 2008 23:43:36 +0000 (16:43 -0700)]
clean-up swizzle fields in fog code, fix NegateBase

16 years agoFix broken fog.
Brian [Wed, 16 Jan 2008 23:31:37 +0000 (16:31 -0700)]
Fix broken fog.

Note that fogcoord and front-facing attribs are in the same register, in the
X and Y channels, respectively.

16 years agoFix incorrect [0,1] clamping in store_dest().
Brian [Wed, 16 Jan 2008 23:29:36 +0000 (16:29 -0700)]
Fix incorrect [0,1] clamping in store_dest().

16 years agotweaks to quad drawing, set UsesKill in bitmap shader
Brian [Wed, 16 Jan 2008 20:55:08 +0000 (13:55 -0700)]
tweaks to quad drawing, set UsesKill in bitmap shader

16 years agocopy UsesKill state in _mesa_combine_programs()
Brian [Wed, 16 Jan 2008 20:54:32 +0000 (13:54 -0700)]
copy UsesKill state in _mesa_combine_programs()

16 years agovbuf updates/fixes (KeithW)
Brian [Wed, 16 Jan 2008 17:57:53 +0000 (10:57 -0700)]
vbuf updates/fixes (KeithW)

Plus, update i915 and Cell drivers for latest vbuf->draw() params.

16 years agos/DBG/DRAW_DBG
Brian [Wed, 16 Jan 2008 17:57:10 +0000 (10:57 -0700)]
s/DBG/DRAW_DBG

16 years agoremove useless assertions
Brian [Wed, 16 Jan 2008 17:56:38 +0000 (10:56 -0700)]
remove useless assertions

16 years agoinit front/back color attrib indexes to 0, not -1
Brian [Wed, 16 Jan 2008 17:56:23 +0000 (10:56 -0700)]
init front/back color attrib indexes to 0, not -1

16 years agoFix a two-sided lighting bug (fixes samples/wave.c)
Brian [Wed, 16 Jan 2008 15:30:00 +0000 (08:30 -0700)]
Fix a two-sided lighting bug (fixes samples/wave.c)

16 years agonouveau: remove assertions from PIPE_ -> GL_
Ben Skeggs [Wed, 16 Jan 2008 02:50:00 +0000 (13:50 +1100)]
nouveau: remove assertions from PIPE_ -> GL_

It seems we need to keep some sane defaults around for a bit, at least until
the pipe drivers learn to avoid translating things like alpha_src_factor when
blend_enable is false.

16 years agonv40: stronger type safety
Ben Skeggs [Wed, 16 Jan 2008 02:41:50 +0000 (13:41 +1100)]
nv40: stronger type safety

16 years agonouveau: don't use GL headers at all
Ben Skeggs [Wed, 16 Jan 2008 02:37:13 +0000 (13:37 +1100)]
nouveau: don't use GL headers at all

16 years agonouveau: gallium changes..
Ben Skeggs [Wed, 16 Jan 2008 02:18:46 +0000 (13:18 +1100)]
nouveau: gallium changes..

16 years agoMerge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Ben Skeggs [Wed, 16 Jan 2008 02:14:19 +0000 (13:14 +1100)]
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

src/mesa/pipe/Makefile

16 years agotypedef uintptr_t for non-HAVE_POSIX_MEMALIGN build
Brian [Wed, 16 Jan 2008 01:32:51 +0000 (18:32 -0700)]
typedef uintptr_t for non-HAVE_POSIX_MEMALIGN build

16 years agoDon't include stdint.h or inttypes. Use the uint64 typedef instead of uint64_t.
Brian [Wed, 16 Jan 2008 01:27:14 +0000 (18:27 -0700)]
Don't include stdint.h or inttypes.  Use the uint64 typedef instead of uint64_t.

16 years agoreplace _mesa_printf() with fprintf()
Brian [Wed, 16 Jan 2008 01:26:21 +0000 (18:26 -0700)]
replace _mesa_printf() with fprintf()

16 years agoremove redundant llvm subdir
Brian [Wed, 16 Jan 2008 01:22:35 +0000 (18:22 -0700)]
remove redundant llvm subdir

16 years agoinclude pipe/draw/draw_context.h
Brian [Wed, 16 Jan 2008 01:22:23 +0000 (18:22 -0700)]
include pipe/draw/draw_context.h

16 years agoAdd surface status/clear_value fields, PIPE_SURFACE_STATUS_x tokens
Brian [Tue, 15 Jan 2008 21:18:17 +0000 (14:18 -0700)]
Add surface status/clear_value fields, PIPE_SURFACE_STATUS_x tokens

16 years agofree stvp->draw_shader
Brian [Tue, 15 Jan 2008 02:18:35 +0000 (19:18 -0700)]
free stvp->draw_shader

16 years agoFix problems with vertex shaders and the private draw module.
Brian [Tue, 15 Jan 2008 02:12:46 +0000 (19:12 -0700)]
Fix problems with vertex shaders and the private draw module.

The CSO returned by pipe->create_vs_state() can't be passed to the
private draw module.  That was causing glRasterPos to blow up.
Add a 'draw_shader' field to st_vertex_program for use with the private
draw module.
Change st_context->state.vs type from cso_vertex_shader to st_vertex_program.

16 years agodisable debug printf
Brian [Tue, 15 Jan 2008 02:04:45 +0000 (19:04 -0700)]
disable debug printf

16 years agoCell: after sending a batch, wait for a DMA completion signal.
Brian [Mon, 14 Jan 2008 23:39:26 +0000 (16:39 -0700)]
Cell: after sending a batch, wait for a DMA completion signal.

This fixes sporadic rendering glitches.
Using a mailbox msg for now, until spe_mfcio_tag_status_read() or similar
is found to work.

16 years agoclamp colors during float->int conversion
Brian [Mon, 14 Jan 2008 23:37:13 +0000 (16:37 -0700)]
clamp colors during float->int conversion

16 years agoCell: update surface map code to match recent changes in pipe_surface struct
Brian [Mon, 14 Jan 2008 18:11:08 +0000 (11:11 -0700)]
Cell: update surface map code to match recent changes in pipe_surface struct

16 years agoRemove pipe->get/put_tile_rgba.
Michel Dänzer [Mon, 14 Jan 2008 15:17:01 +0000 (16:17 +0100)]
Remove pipe->get/put_tile_rgba.

pipe_get/put_tile_rgba() now use pipe->get/put_tile internally.

Also simplify the <format>_get/put_tile_rgba() helper functions and clean up
some inconsitencies in them.

16 years agoRemove mapping fields from struct pipe_surface.
Michel Dänzer [Thu, 10 Jan 2008 16:44:04 +0000 (17:44 +0100)]
Remove mapping fields from struct pipe_surface.

It's now the responsibility of surface users to keep track of their mappings.

16 years agoCell: remove fb parameter to get/put_tile()
Brian [Sat, 12 Jan 2008 23:58:50 +0000 (16:58 -0700)]
Cell: remove fb parameter to get/put_tile()

16 years agoCell: disable cell_emit_state() for now
Brian [Sat, 12 Jan 2008 23:57:55 +0000 (16:57 -0700)]
Cell: disable cell_emit_state() for now

16 years agoCell: collect vars in a spu_global struct
Brian [Sat, 12 Jan 2008 19:53:49 +0000 (12:53 -0700)]
Cell: collect vars in a spu_global struct

16 years agoCell: first state object (depth/stencil/alpha) emitted to SPUs
Brian [Sat, 12 Jan 2008 19:39:26 +0000 (12:39 -0700)]
Cell: first state object (depth/stencil/alpha) emitted to SPUs

16 years agoCell: whitespace/cleanup
Brian [Sat, 12 Jan 2008 18:41:23 +0000 (11:41 -0700)]
Cell: whitespace/cleanup

16 years agoCell: prefix SPU files with spu_
Brian [Sat, 12 Jan 2008 17:33:50 +0000 (10:33 -0700)]
Cell: prefix SPU files with spu_

16 years agoCell: prefix SPU sources with spu_
Brian [Sat, 12 Jan 2008 17:33:24 +0000 (10:33 -0700)]
Cell: prefix SPU sources with spu_

16 years agoCell: sketch out needed rasterizer state
Brian [Sat, 12 Jan 2008 17:06:27 +0000 (10:06 -0700)]
Cell: sketch out needed rasterizer state

16 years agos/int/uint/ to silence warnings
Brian [Fri, 11 Jan 2008 23:32:20 +0000 (16:32 -0700)]
s/int/uint/ to silence warnings

16 years agowhitespace, comment changes
Brian [Fri, 11 Jan 2008 23:31:58 +0000 (16:31 -0700)]
whitespace, comment changes

16 years agoCell: basic batch buffer working
Brian [Fri, 11 Jan 2008 23:08:53 +0000 (16:08 -0700)]
Cell: basic batch buffer working

16 years agoCell: initial work for a hw-like batch buffer system
Brian [Fri, 11 Jan 2008 19:04:55 +0000 (12:04 -0700)]
Cell: initial work for a hw-like batch buffer system

16 years agoCell: remove obsolete cell_prim_buffer struct and code
Brian [Fri, 11 Jan 2008 18:35:03 +0000 (11:35 -0700)]
Cell: remove obsolete cell_prim_buffer struct and code

16 years agoCell: debug code, comments
Brian [Fri, 11 Jan 2008 18:31:03 +0000 (11:31 -0700)]
Cell: debug code, comments

16 years agovbuf_flush_vertices() instead of vbuf_flush_indices() in vbuf_end()
Brian [Fri, 11 Jan 2008 18:30:02 +0000 (11:30 -0700)]
vbuf_flush_vertices() instead of vbuf_flush_indices() in vbuf_end()

16 years agoCell: reformattting
Brian [Fri, 11 Jan 2008 18:27:24 +0000 (11:27 -0700)]
Cell: reformattting

16 years agos/int/uint/ to silence warning
Brian [Fri, 11 Jan 2008 18:27:09 +0000 (11:27 -0700)]
s/int/uint/ to silence warning

16 years agoFix malloc size buf, silence signed/unsigned comparision warning
Brian [Fri, 11 Jan 2008 17:10:45 +0000 (10:10 -0700)]
Fix malloc size buf, silence signed/unsigned comparision warning

16 years agoCell: Remove the pre-vbuf rendering code
Brian [Fri, 11 Jan 2008 15:14:42 +0000 (08:14 -0700)]
Cell: Remove the pre-vbuf rendering code

16 years agoCell: wait_on_mask_all()
Brian [Fri, 11 Jan 2008 04:59:15 +0000 (21:59 -0700)]
Cell: wait_on_mask_all()

16 years agoCell: remove unneeded #includes
Brian [Fri, 11 Jan 2008 04:53:38 +0000 (21:53 -0700)]
Cell: remove unneeded #includes