Brian Paul
0a95f203fa
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-20 11:34:36 -06:00
Brian Paul
34149ec89d
copy StateFlags in _mesa_clone_parameter_list()
...
cherry-picked from master (b539b61321
2008-05-20 11:31:20 -06:00
Brian Paul
c95c4efa54
fix incorrect sampler numbering/indexing.
...
All samplers indexes were zero.
cherry-picked from master (b6fb0940c2
2008-05-20 11:29:58 -06:00
Brian Paul
b539b61321
copy StateFlags in _mesa_clone_parameter_list()
2008-05-20 11:29:16 -06:00
Brian Paul
4978953c79
new multi-texture GLSL test
2008-05-20 11:01:17 -06:00
Brian Paul
b6fb0940c2
fix incorrect sampler numbering/indexing.
...
All samplers indexes were zero.
2008-05-20 10:59:18 -06:00
Corbin Simpson
2bda1a9502
r5xx: Count refs so we don't have to guess on temp reg allocation.
...
As a bonus, we can now have multiple temp temps, by slot.
2008-05-20 09:47:50 -07:00
Corbin Simpson
94994b13c5
r5xx: Fixup SOP insts.
...
Use the correct swizzle for alpha/SOP stuff.
2008-05-19 23:56:53 -07:00
Corbin Simpson
78fa506059
r5xx: New fix for COS/SIN/SCS.
...
Not perfect yet, but getting better.
2008-05-19 23:56:53 -07:00
Dave Airlie
f0d76d526b
r300/r500: fixup some of the register write sizes
2008-05-20 16:30:36 +10:00
Dave Airlie
2005de48f9
r300: some ctrl-m's wierd.
2008-05-20 16:02:19 +10:00
Dave Airlie
282cdc8b5c
r300/r500: fix RS col fmt bits
2008-05-20 15:59:56 +10:00
Xiang, Haihao
c6b36e5498
i965: Check fallback before accounting for index/vertex buffer size. fix #16028 .
2008-05-20 13:28:42 +08:00
Brian Paul
de03e8e960
gallium: remove dead code
2008-05-19 16:07:10 -06:00
Brian Paul
65075da8c3
fix tempReg test in _mesa_combine_programs()
2008-05-19 16:07:10 -06:00
Brian Paul
655374bda7
gallium: remove dead code
2008-05-19 16:05:41 -06:00
Brian Paul
8493f0849f
fix tempReg test in _mesa_combine_programs()
2008-05-19 16:04:46 -06:00
Brian Paul
e469d78d33
fix tempReg test in _mesa_combine_programs()
2008-05-19 16:03:43 -06:00
Brian Paul
d00c8a52f3
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-19 12:48:06 -06:00
Brian Paul
21e614eabc
gallium: fix some texture object leaks
2008-05-19 12:40:49 -06:00
Corbin Simpson
476248befe
r5xx: Fixup emit_tex, add debugging info, enable temp temps.
...
emit_tex now chases itself with an OUT if needed.
Added airlied's dump_program, with some fixes.
2008-05-19 11:06:41 -07:00
Zack Rusin
09900df429
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
2008-05-19 12:10:42 -04:00
Brian Paul
a846b156b8
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-19 09:36:10 -06:00
Brian Paul
59007a811d
if x86_get_func() returns NULL, handle it properly instead of aborting
2008-05-19 09:34:28 -06:00
Brian Paul
38fb20b224
fix program delete/refcount bug
...
cherry-picked from gallium-tex-surfaces
2008-05-19 09:04:02 -06:00
Brian Paul
62f96ddbbc
Fix program refcounting assertion failure during context tear-down
...
When purging the program hash table, the refcount _should_ be one since
the program is referenced by the hash table. Need to explicitly set to
zero before calling delete().
Also, purge high-level shader hash tables before low-level program hash tabl
cherry-picked from master
2008-05-19 08:59:41 -06:00
Brian Paul
fbfe2a58de
Fix program refcounting assertion failure during context tear-down
...
When purging the program hash table, the refcount _should_ be one since
the program is referenced by the hash table. Need to explicitly set to
zero before calling delete().
Also, purge high-level shader hash tables before low-level program hash tables.
2008-05-19 08:43:36 -06:00
Dave Airlie
03b3fed8f1
r500: add more input srcs
2008-05-19 21:58:28 +10:00
Dave Airlie
ac315792bf
r500: fix swz gets and some returns
2008-05-19 21:40:40 +10:00
Dave Airlie
60b8e1f524
r500: add mask debugging
2008-05-19 21:11:55 +10:00
Dave Airlie
cddab021e3
r500: add fragment program debug dumper
2008-05-19 20:24:09 +10:00
Corbin Simpson
c60bdcf8a8
r5xx: Fix magic offsets for output fifo write masks.
...
Well, this sure explains a lot.
2008-05-19 00:00:08 -07:00
Corbin Simpson
2708d7f700
r5xx: Swap sources for CMP.
...
Follows the same pattern as the op on r3xx/r4xx. Thanks airlied.
2008-05-18 23:52:54 -07:00
Corbin Simpson
a6c38f2f64
r5xx: Fix typo of epic proportions.
2008-05-18 23:35:07 -07:00
José Fonseca
aafe3ddee2
i915simple: Fix win9x build.
2008-05-19 15:18:40 +09:00
José Fonseca
5ca4f9e97c
gallium: Additional formats for bump mapping.
2008-05-19 15:01:17 +09:00
José Fonseca
820fe36863
gallium: Fix typo.
2008-05-19 15:01:17 +09:00
Corbin Simpson
2225b9bdb0
r5xx: ALU/OUT fixups.
...
Lots of small changes. Intentionally breaks some tex stuffs.
2008-05-18 22:38:28 -07:00
Brian Paul
88cdc5e23f
fix program delete/refcount bug
2008-05-18 16:37:35 -06:00
Brian Paul
54fbd8bbd4
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-18 16:17:50 -06:00
Brian Paul
fd59f19cd2
Move _mesa_init_glsl_driver_functions() into shader_api.c
...
This allows making a bunch of functions static, and removes a state
tracker dependency on driverfuncs.c
cherry-picked from gallium-0.1
2008-05-18 16:04:55 -06:00
Brian Paul
88c0a74633
additional fog/color matrix changes from gallium-0.1
2008-05-18 15:55:24 -06:00
Brian Paul
6e92968d75
add state vars for color matrix, pixel transfer scale&bias
...
cherry-picked from gallium-0.1 (068c7bd912
2008-05-18 15:52:13 -06:00
Brian Paul
2f8fc325ac
mesa: added internal post color matrix scale/bias vars
...
cherry-picked from gallium-0.1 (302daeb2ec
2008-05-18 15:50:20 -06:00
Brian Paul
a0bfeb0c3c
print vertex.attrib[n] (from master)
2008-05-18 15:46:58 -06:00
Brian Paul
0c78c766e4
fixes to _mesa_combine_programs(), from gallium-0.1
2008-05-18 15:46:26 -06:00
Brian Paul
5976a6a75c
added div by zero check for Fog.End/Start (from gallium-0.1)
2008-05-18 15:41:36 -06:00
Brian Paul
4b6b0fd526
clean-ups / additions from gallium-0.1 branch
2008-05-18 15:41:01 -06:00
Brian Paul
1036ec94e5
Fix some bugs in material, depth range state
...
picked from master
2008-05-18 15:32:58 -06:00
Brian Paul
1bb30b02dd
Regenerated API dispatch files
...
Follow on to cherry-pick from master
2008-05-18 15:23:03 -06:00
