mesa.git
16 years agoMerge branch 'gallium-0.1' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa...
Stephane Marchesin [Wed, 2 Apr 2008 03:10:52 +0000 (05:10 +0200)]
Merge branch 'gallium-0.1' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa into gallium-0.1

16 years agonv10: fix stuff and things.
Stephane Marchesin [Wed, 2 Apr 2008 03:10:18 +0000 (05:10 +0200)]
nv10: fix stuff and things.

16 years agonv40: only update draw module state when using swtnl
Ben Skeggs [Wed, 2 Apr 2008 03:04:06 +0000 (13:04 +1000)]
nv40: only update draw module state when using swtnl

16 years agonv40: shorten zsa state lines
Ben Skeggs [Wed, 2 Apr 2008 02:54:37 +0000 (12:54 +1000)]
nv40: shorten zsa state lines

16 years agonouveau: winsys printf disappeared :)
Ben Skeggs [Tue, 1 Apr 2008 14:40:18 +0000 (00:40 +1000)]
nouveau: winsys printf disappeared :)

16 years agoMerge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Tue, 1 Apr 2008 14:37:12 +0000 (00:37 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

16 years agodraw: more flatshade_first changes
Keith Whitwell [Tue, 1 Apr 2008 13:49:56 +0000 (14:49 +0100)]
draw: more flatshade_first changes

- Reduce the number of changes to the normal vertex ordering
- Assume that the hardware knows how to do this in the standard case.
- Add support to the passthrough vcache path.

16 years agodraw: respect flatshade_first in flatshade stage
Keith Whitwell [Tue, 1 Apr 2008 13:48:59 +0000 (14:48 +0100)]
draw: respect flatshade_first in flatshade stage

16 years agodraw: associate rhw divide with clipping not viewport flag
Keith Whitwell [Tue, 1 Apr 2008 13:14:46 +0000 (14:14 +0100)]
draw: associate rhw divide with clipping not viewport flag

16 years agodraw: flush between pt/non-pt modes
Keith Whitwell [Tue, 1 Apr 2008 13:14:06 +0000 (14:14 +0100)]
draw: flush between pt/non-pt modes

16 years agogallium: Fencing fix.
Michel Dänzer [Tue, 1 Apr 2008 12:02:30 +0000 (13:02 +0100)]
gallium: Fencing fix.

Make sure the struct pipe_fence_handle* we point st_flush() to is initialized
to NULL, so winsys->fence_reference() doesn't try to unreference a random
struct pipe_fence_handle* pointer.

16 years agoscons: Fix test for building dri/intel winsys.
Michel Dänzer [Tue, 1 Apr 2008 12:00:51 +0000 (13:00 +0100)]
scons: Fix test for building dri/intel winsys.

16 years agocell: update some of the CAP, texformat queries
Brian [Tue, 1 Apr 2008 03:15:57 +0000 (21:15 -0600)]
cell: update some of the CAP, texformat queries

16 years agocell: more work for multi-texture support
Brian [Tue, 1 Apr 2008 03:09:02 +0000 (21:09 -0600)]
cell: more work for multi-texture support

16 years agocell: set cell->num_textures in cell_set_sampler_textures()
Brian [Tue, 1 Apr 2008 02:36:53 +0000 (20:36 -0600)]
cell: set cell->num_textures in cell_set_sampler_textures()

16 years agogallium: Do not assume that buffers are freed in the same order they are fenced.
José Fonseca [Tue, 1 Apr 2008 01:41:43 +0000 (10:41 +0900)]
gallium: Do not assume that buffers are freed in the same order they are fenced.

Also free buffers as soon as possible.

This short term fix corrects the fenced list behavior but it will impact on performance.
The long term fix is probably replace the linked list (legacy from the bufpool code) by
a binary tree.

16 years agocell: initial work to support multi-texture
Brian [Mon, 31 Mar 2008 23:38:21 +0000 (17:38 -0600)]
cell: initial work to support multi-texture

16 years agocell: added const qualifier
Brian [Mon, 31 Mar 2008 22:54:31 +0000 (16:54 -0600)]
cell: added const qualifier

16 years agocell: updated comments: s/test/SPE/
Brian [Mon, 31 Mar 2008 22:44:56 +0000 (16:44 -0600)]
cell: updated comments: s/test/SPE/

16 years agocell: implement logicop/output for PIPE_FORMAT_B8G8R8A8_UNORM
Brian [Mon, 31 Mar 2008 22:35:13 +0000 (16:35 -0600)]
cell: implement logicop/output for PIPE_FORMAT_B8G8R8A8_UNORM

Remote display to my usual terminal shows the right colors again.
Not 100% sure about the shuffle control words, but they seem to work.

16 years agogallium: Compute YCBCR bit depth.
José Fonseca [Mon, 31 Mar 2008 22:22:10 +0000 (07:22 +0900)]
gallium: Compute YCBCR bit depth.

16 years agogallium: used inverted bitmap texture to simplify the fragment shader.
Brian [Mon, 31 Mar 2008 21:12:14 +0000 (15:12 -0600)]
gallium: used inverted bitmap texture to simplify the fragment shader.

"Off" bits get stored as texel=0xff and "on" bits get stored as texel=0x0.
Then use KIL -tmp to kill the off bits and keep the on bits.
This shortens the fragment program by two instructions.

16 years agogallium: updated comment for bypass_vs
Brian [Mon, 31 Mar 2008 21:12:01 +0000 (15:12 -0600)]
gallium: updated comment for bypass_vs

16 years agofix parsing bug involving comments at the end of ARB v/f programs
Markus Amsler [Mon, 31 Mar 2008 20:58:11 +0000 (14:58 -0600)]
fix parsing bug involving comments at the end of ARB v/f programs

16 years agogallium: use cso_save/restore_sampler_textures() functions
Brian [Mon, 31 Mar 2008 20:38:27 +0000 (14:38 -0600)]
gallium: use cso_save/restore_sampler_textures() functions

16 years agogallium: draw_passthrough.c is obsolete - removed
Brian [Mon, 31 Mar 2008 20:20:16 +0000 (14:20 -0600)]
gallium: draw_passthrough.c is obsolete - removed

16 years agogallium: set the bypass_vs flag now
Brian [Mon, 31 Mar 2008 20:18:36 +0000 (14:18 -0600)]
gallium: set the bypass_vs flag now

The glBitmap vertex shader is a no-op, but we still have to specify it in
order to convey the number of inputs/outputs.

16 years agogallium: move the test for bypass_vs into the vs_XXX_run() functions
Brian [Mon, 31 Mar 2008 20:14:30 +0000 (14:14 -0600)]
gallium: move the test for bypass_vs into the vs_XXX_run() functions

Also:
1. Added an identity_viewport flag to skip viewport transformation when it
has no effect.  Might also add an explicit bypass_viewport flag someday.
2. Separate the code for computing clip codes and doing the viewport transform.
Predicate them separately.
Note: even if bypass_vs is set, we still look at the shader to determine the
number of inputs and outputs.

16 years agogallium: draw_passthrough.c is not used anymore
Brian [Mon, 31 Mar 2008 20:13:09 +0000 (14:13 -0600)]
gallium: draw_passthrough.c is not used anymore

16 years agogallium: draw_passthrough.c is not used anymore
Brian [Mon, 31 Mar 2008 20:06:42 +0000 (14:06 -0600)]
gallium: draw_passthrough.c is not used anymore

16 years agogallium: turn on clipping for bitmaps
Brian [Mon, 31 Mar 2008 18:18:20 +0000 (12:18 -0600)]
gallium: turn on clipping for bitmaps

Bitmaps can extend beyond window edges so we need to clip.
Also, move some state atom vars to st_context to be a bit more efficient.

16 years agogallium: Eliminate p_winsys::printf
José Fonseca [Mon, 31 Mar 2008 00:02:08 +0000 (09:02 +0900)]
gallium: Eliminate p_winsys::printf

Not convenient and almost not used at all. Better replacements in p_debug.h

16 years agonv40: fix slight thinko
Ben Skeggs [Sun, 30 Mar 2008 23:37:57 +0000 (09:37 +1000)]
nv40: fix slight thinko

16 years agonouveau: update object header
Ben Skeggs [Sun, 30 Mar 2008 23:29:22 +0000 (09:29 +1000)]
nouveau: update object header

16 years agonv40: support vp clip distance regs, unused currently.
Ben Skeggs [Sun, 30 Mar 2008 23:00:25 +0000 (09:00 +1000)]
nv40: support vp clip distance regs, unused currently.

16 years agodraw: Do not run full pipeline when flatshade_first for point primitives.
Michal Krol [Sun, 30 Mar 2008 21:21:20 +0000 (23:21 +0200)]
draw: Do not run full pipeline when flatshade_first for point primitives.

16 years agodraw: Fix bypass_vs semantic misuse.
Michal Krol [Sun, 30 Mar 2008 20:48:49 +0000 (22:48 +0200)]
draw: Fix bypass_vs semantic misuse.

16 years agonv40: track current scissor enable/disable state
Ben Skeggs [Sun, 30 Mar 2008 20:35:43 +0000 (06:35 +1000)]
nv40: track current scissor enable/disable state

Not sure how this was forgotten :)  Anyhow, fixes gearbox/bzflag/xmoto,
probably other things that use scissored clears / hit the nasty
clear-with-quad path.

16 years agonv30: use FREE macro
Patrice Mandin [Sun, 30 Mar 2008 19:52:36 +0000 (21:52 +0200)]
nv30: use FREE macro

16 years agonv40: mark fp dirty even when only consts updated
Ben Skeggs [Sun, 30 Mar 2008 19:13:06 +0000 (05:13 +1000)]
nv40: mark fp dirty even when only consts updated

Fixes arbfplight "sticking".

16 years agonouveau: adapt to recent gallium changes
Ben Skeggs [Sun, 30 Mar 2008 10:32:22 +0000 (20:32 +1000)]
nouveau: adapt to recent gallium changes

16 years agoMerge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Ben Skeggs [Sun, 30 Mar 2008 09:58:03 +0000 (19:58 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

16 years agonv40: vp 1/0/- swz
Ben Skeggs [Sun, 30 Mar 2008 09:08:59 +0000 (19:08 +1000)]
nv40: vp 1/0/- swz

16 years agonv40: vp const/immd fix
Ben Skeggs [Sun, 30 Mar 2008 09:00:07 +0000 (19:00 +1000)]
nv40: vp const/immd fix

16 years agogallium: Set vertex state/buffers en-mass.
Brian Paul [Sat, 29 Mar 2008 13:41:03 +0000 (14:41 +0100)]
gallium: Set vertex state/buffers en-mass.

16 years agogallium: Fix some MSVC warnings.
José Fonseca [Tue, 25 Mar 2008 17:30:34 +0000 (17:30 +0000)]
gallium: Fix some MSVC warnings.

16 years agogallium: begin some bounding box code for bitmap cache
Brian [Sat, 29 Mar 2008 00:41:10 +0000 (18:41 -0600)]
gallium: begin some bounding box code for bitmap cache

16 years agogallium: added an (int) cast in setup_bitmap_vertex_data() to fix a signed/unsigned...
Brian [Sat, 29 Mar 2008 00:18:55 +0000 (18:18 -0600)]
gallium: added an (int) cast in setup_bitmap_vertex_data() to fix a signed/unsigned arithmetic problem

Negative values became very large uints.

16 years agogallium: Fix computation of Z values when not using early Z.
Brian [Fri, 28 Mar 2008 21:22:34 +0000 (15:22 -0600)]
gallium: Fix computation of Z values when not using early Z.

This fixes the missing bitmaps in the engine and fogcoord demos.

16 years agogallium: don't call st_flush_bitmap_cache() if the only change is _NEW_PACKUNPACK...
Brian [Fri, 28 Mar 2008 21:17:50 +0000 (15:17 -0600)]
gallium: don't call st_flush_bitmap_cache() if the only change is _NEW_PACKUNPACK state

16 years agogallium: disable a debug hack
Brian [Fri, 28 Mar 2008 20:56:05 +0000 (14:56 -0600)]
gallium: disable a debug hack

16 years agogallium: implement a glBitmap cache
Brian [Fri, 28 Mar 2008 20:53:47 +0000 (14:53 -0600)]
gallium: implement a glBitmap cache

The bitmap cache attempts to accumulate a series of glBitmap calls in a
buffer to effectively render a whole bunch of bitmaps at once.

The cache can be disabled, if needed, by setting UseBitmapCache=GL_FALSE.

16 years agomesa: fix texture/renderbuffer mix-up in test_attachment_completeness()
Brian Paul [Fri, 28 Mar 2008 19:10:16 +0000 (13:10 -0600)]
mesa: fix texture/renderbuffer mix-up in test_attachment_completeness()

16 years agogallium: re-work texture format selection code
Brian Paul [Fri, 28 Mar 2008 19:09:19 +0000 (13:09 -0600)]
gallium: re-work texture format selection code

Use same code for choosing texture format and renderbuffer format.

16 years agogallium: remove redundant compare bit in sampler state
Roland Scheidegger [Fri, 28 Mar 2008 14:43:00 +0000 (15:43 +0100)]
gallium: remove redundant compare bit in sampler state

16 years agogallium: Bump PIPE_MAX_SAMPLERS to 16.
Michal Krol [Fri, 28 Mar 2008 11:31:35 +0000 (12:31 +0100)]
gallium: Bump PIPE_MAX_SAMPLERS to 16.

We need it to fulfil D3D minimum requirements.

16 years agoIf visual is 32bpp, set visual->alphaBits = 8.
Brian [Fri, 28 Mar 2008 03:11:45 +0000 (21:11 -0600)]
If visual is 32bpp, set visual->alphaBits = 8.

This works since we always use XImages for color buffers.  It wouldn't always
work for Windows/Pixmaps.

16 years agogallium: replace PIPE_ATTRIB_MAX with PIPE_MAX_ATTRIBS
Brian [Thu, 27 Mar 2008 23:41:55 +0000 (17:41 -0600)]
gallium: replace PIPE_ATTRIB_MAX with PIPE_MAX_ATTRIBS

The later follows the naming scheme of other limits.
Keep the old definition until all possible usage is updated.

16 years agogallium: updated/improved comments, minor re-formatting
Brian Paul [Thu, 27 Mar 2008 23:18:25 +0000 (17:18 -0600)]
gallium: updated/improved comments, minor re-formatting

16 years agoconsolidate some parsing functions that were pretty much identical for vertex/fragmen...
Brian [Thu, 27 Mar 2008 22:19:46 +0000 (16:19 -0600)]
consolidate some parsing functions that were pretty much identical for vertex/fragment programs

cherry-picked from master

16 years agomesa: misc sync-up with master
Brian [Thu, 27 Mar 2008 22:05:40 +0000 (16:05 -0600)]
mesa: misc sync-up with master

16 years agoraise GL_INVALID_OPERATION if glProgramString compilation fails
Brian [Thu, 27 Mar 2008 22:04:20 +0000 (16:04 -0600)]
raise GL_INVALID_OPERATION if glProgramString compilation fails

cherry-picked from master

16 years agoFix the compile of disabled DEBUG_PARSING code.
Brian [Thu, 27 Mar 2008 21:54:44 +0000 (15:54 -0600)]
Fix the compile of disabled DEBUG_PARSING code.

cherry-picked from master

16 years agomake sure state token values are fully initialized
Brian [Thu, 27 Mar 2008 21:52:00 +0000 (15:52 -0600)]
make sure state token values are fully initialized

cherry-picked from master

16 years agoadded program_error2() function for better error reporting
Brian [Thu, 27 Mar 2008 21:51:07 +0000 (15:51 -0600)]
added program_error2() function for better error reporting

cherry-picked from master

16 years agoFix state.texgen parsing error (bug 12313).
Brian [Thu, 27 Mar 2008 21:48:54 +0000 (15:48 -0600)]
Fix state.texgen parsing error (bug 12313).

Replace *(*inst++) with *(*inst)++ in a few places.

Cherry-picked from master.

16 years agogallium: Update calls to the simple shader functions
Brian [Thu, 27 Mar 2008 21:42:52 +0000 (15:42 -0600)]
gallium: Update calls to the simple shader functions

16 years agogallium: return pipe_shader_state from the simple shader functions
Brian [Thu, 27 Mar 2008 21:42:09 +0000 (15:42 -0600)]
gallium: return pipe_shader_state from the simple shader functions

Allows us to fix a mem leak (tokens array).

16 years agogallium: fix Element() macro redefinition warning
Brian [Thu, 27 Mar 2008 21:41:52 +0000 (15:41 -0600)]
gallium: fix Element() macro redefinition warning

16 years agogallium: fix incorrect types for shaders
Brian [Thu, 27 Mar 2008 21:35:25 +0000 (15:35 -0600)]
gallium: fix incorrect types for shaders

16 years agogallium: remove temporary static var
Brian [Thu, 27 Mar 2008 21:33:47 +0000 (15:33 -0600)]
gallium: remove temporary static var

16 years agogallium: silence unused var warning
Brian [Thu, 27 Mar 2008 21:27:31 +0000 (15:27 -0600)]
gallium: silence unused var warning

16 years agocell: include cell_state_per_fragment.h to silence warning
Brian [Thu, 27 Mar 2008 21:27:14 +0000 (15:27 -0600)]
cell: include cell_state_per_fragment.h to silence warning

16 years agocell: added (uint64_t) cast to silence warning
Brian [Thu, 27 Mar 2008 21:26:54 +0000 (15:26 -0600)]
cell: added (uint64_t) cast to silence warning

16 years agocell: fix unclosed comment
Brian [Thu, 27 Mar 2008 21:26:22 +0000 (15:26 -0600)]
cell: fix unclosed comment

16 years agoxlib: Fix build error from recent fence changes
Ian Romanick [Wed, 26 Mar 2008 17:52:08 +0000 (10:52 -0700)]
xlib: Fix build error from recent fence changes

16 years agocell: Implement code-gen for logic op
Ian Romanick [Wed, 26 Mar 2008 17:45:32 +0000 (10:45 -0700)]
cell: Implement code-gen for logic op

This also implements code-gen for the float-to-packed color
conversion.  It's currently hardcoded for A8R8G8B8, but that can
easily be fixed as soon as other color depths are supported by the
Cell driver.

16 years agogallium: need to call st_validate_state() in Bitmap()
Brian Paul [Wed, 26 Mar 2008 15:02:54 +0000 (09:02 -0600)]
gallium: need to call st_validate_state() in Bitmap()

16 years agogallium: as for aapoints, make the extra texcoord per-shader state
Brian Paul [Wed, 26 Mar 2008 14:21:17 +0000 (08:21 -0600)]
gallium: as for aapoints, make the extra texcoord per-shader state

16 years agogallium: Change pipe->flush() interface to optionally return a fence.
Michel Dänzer [Wed, 26 Mar 2008 09:36:40 +0000 (09:36 +0000)]
gallium: Change pipe->flush() interface to optionally return a fence.

The cell driver still uses an internal CELL_FLUSH_WAIT flag, in the long run
proper fencing should be implemented for it.

16 years agogallium: the generic attrib we use for computing coverage is per-shader
Brian [Wed, 26 Mar 2008 01:19:14 +0000 (19:19 -0600)]
gallium: the generic attrib we use for computing coverage is per-shader

Fixes a very tricky conformance failure.

16 years agogallium: added fragment emit/write debug counters
Brian [Wed, 26 Mar 2008 01:18:56 +0000 (19:18 -0600)]
gallium: added fragment emit/write debug counters

16 years agocell: Enable MIT-SHM on Cell.
Ian Romanick [Wed, 26 Mar 2008 01:15:34 +0000 (18:15 -0700)]
cell: Enable MIT-SHM on Cell.

16 years agoxlib: Add support for MIT-SHM in xlib winsys driver
Ian Romanick [Wed, 26 Mar 2008 01:07:56 +0000 (18:07 -0700)]
xlib: Add support for MIT-SHM in xlib winsys driver

Gives about a 3% performance increase in gears on x86-64 (non-tiled)
and about 10% performance increase in gears on Cell (tiled).  I
actually expected more of a boost. :(

16 years agocell: Float convert-to and convert-from instructions use different shift bias
Ian Romanick [Mon, 24 Mar 2008 19:15:59 +0000 (12:15 -0700)]
cell: Float convert-to and convert-from instructions use different shift bias

16 years agodraw: Take flatshade_first rasterizer bit into account.
Michal Krol [Tue, 25 Mar 2008 22:49:11 +0000 (23:49 +0100)]
draw: Take flatshade_first rasterizer bit into account.

16 years agogallium: Introduce flatshade_first field to rasterizer_state.
Michal Krol [Tue, 25 Mar 2008 22:48:30 +0000 (23:48 +0100)]
gallium: Introduce flatshade_first field to rasterizer_state.

This bit tells us which vertex of the primitive is used to
propagate color for the remaining vertices if flatshade mode.

16 years agogallium: disable the selection/feedback draw module's options for wide lines, points...
Brian Paul [Tue, 25 Mar 2008 20:12:55 +0000 (14:12 -0600)]
gallium: disable the selection/feedback draw module's options for wide lines, points, etc.

Disable paths that would convert points/lines to tris as that upsets selection,
feedback, rastpos.

16 years agogallium: added some debug code (disable)
Brian Paul [Tue, 25 Mar 2008 18:27:48 +0000 (12:27 -0600)]
gallium: added some debug code (disable)

16 years agomesa: fix some issues in _mesa_combine_programs()
Brian Paul [Tue, 25 Mar 2008 18:27:32 +0000 (12:27 -0600)]
mesa: fix some issues in _mesa_combine_programs()

Use a temporay register to connect outputs of first program to inputs of
second program.
Also, fix bug in replace_registers(): didn't search/replace DstReg.

16 years agodraw: vertex fetch can be validated too early leading to an assertion... disable
Keith Whitwell [Tue, 25 Mar 2008 18:15:58 +0000 (18:15 +0000)]
draw: vertex fetch can be validated too early leading to an assertion... disable

16 years agodraw: don't use fetch_and_store for bypass_vs mode, it's not quite right
Keith Whitwell [Tue, 25 Mar 2008 18:09:25 +0000 (18:09 +0000)]
draw: don't use fetch_and_store for bypass_vs mode, it's not quite right

16 years agomesa: append fog instructions after parsing if a fog option is set
Brian Paul [Tue, 25 Mar 2008 17:32:31 +0000 (11:32 -0600)]
mesa: append fog instructions after parsing if a fog option is set

Drivers don't have to worry about it then.

16 years agomesa: when negating scalar src args, use NEGATE_XYZW, not NEGATE_X
Brian Paul [Tue, 25 Mar 2008 17:22:57 +0000 (11:22 -0600)]
mesa: when negating scalar src args, use NEGATE_XYZW, not NEGATE_X

This makes things easier on the back-end when generating GPU code.

16 years agoFix typo
José Fonseca [Tue, 25 Mar 2008 17:47:39 +0000 (17:47 +0000)]
Fix typo

16 years agodraw: take primitive into account when deciding if the pipeline is active
Keith Whitwell [Tue, 25 Mar 2008 15:17:53 +0000 (15:17 +0000)]
draw: take primitive into account when deciding if the pipeline is active

16 years agogallium: Use debug_get_option for GETENV
José Fonseca [Tue, 25 Mar 2008 11:37:54 +0000 (11:37 +0000)]
gallium: Use debug_get_option for GETENV

16 years agogallium: Fix default option on Windows.
José Fonseca [Tue, 25 Mar 2008 11:37:24 +0000 (11:37 +0000)]
gallium: Fix default option on Windows.

16 years agogallium: don't enable stencil test if no stencil buffer.
Brian Paul [Tue, 25 Mar 2008 01:59:59 +0000 (19:59 -0600)]
gallium: don't enable stencil test if no stencil buffer.

Also, if not doing two-sided stencil, set back-face state = front-face state.

16 years agonv40: respect do_flip in surface_copy()
Ben Skeggs [Tue, 25 Mar 2008 01:57:36 +0000 (12:57 +1100)]
nv40: respect do_flip in surface_copy()