Commit graph

12750 commits

Author SHA1 Message Date
Dan Nicholson
e57f1b702e Follow along GL/glx -> glx renaming in xserver
The xserver glx modules were lifted up to the top level, so this changes
the glapi generation to look in the new location.
2008-05-21 10:55:49 -07:00
Kristian Høgsberg
fe7e01c834 Add remaining glapi generated server headers.
This adds all the headers needed by the xserver glx module and also adds
a rule to copy over the shared glapi.[ch] and glthread.[ch] files.

Specifying an xserver path (set XORG_BASE on the make command line) is
now mandatory when regenerating the glapi files.
2008-05-21 12:13:39 -04:00
Kristian Høgsberg
c30fe8fd7c Make the shared glapi files not include glheader.h. 2008-05-21 12:13:39 -04:00
Kristian Høgsberg
1b359bc88e Revert "glapi: Generate xserver glapi sources in the mesa tree"
This reverts commit 7688791fc5, and takes
us back to generating the glapi files straight into the xserver tree.

Conflicts:

	src/glx/x11/indirect_size_get.c
2008-05-21 12:13:39 -04:00
Corbin Simpson
1e2907f170 r5xx: Add OPCODE_POW.
Necessary for Google Earth, among other things.
2008-05-21 08:24:28 -07:00
George Sapountzis
2217158c37 dri/swrast: use Makefile.template 2008-05-21 18:21:50 +03:00
George Sapountzis
53784e786d dri/swrast: fb configs tweaks
@32: provide configs with depth=0, stencil=8
@16: provide configs with depth=0, stencil=8 and depth=16, stencil=8
2008-05-21 18:20:54 +03:00
George Sapountzis
d0c7ef4358 dri/swrast: re-indent FillInModes 2008-05-21 18:19:49 +03:00
Brian
2ec318640f added readtex.h dependency 2008-05-21 07:05:29 -06:00
Dave Airlie
bb57c30a53 r500: print out opcode string 2008-05-21 16:00:18 +10:00
Dave Airlie
b453b0e2e1 r500: set the RS unit register for R500 not R300 dangnammit..
So this appears to be my BUG. damn it to hell.

also fix sec color to be more like spec says.
2008-05-21 12:14:42 +10:00
Dave Airlie
9ec2b1c83f r500: finish main texture instruction decoding 2008-05-21 10:49:26 +10:00
George Sapountzis
280bf89bd4 Add DRI driver that uses the mesa swrast module. 2008-05-20 16:03:44 -04:00
George Sapountzis
c95e66120b Make utils.h self-contained.
Move stuff with drm dependencies to dri_util.h, and move a couple of
types without drm dependencies to utils.h.
2008-05-20 16:03:44 -04: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
e469d78d33 fix tempReg test in _mesa_combine_programs() 2008-05-19 16:03:43 -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
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
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
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
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
Dave Airlie
bdfd5d95c5 r300: fixup US_OUT_FMT bits 2008-05-18 17:58:29 +10:00
Keith Packard
8b49cc104d [intel-gem] Don't calloc reloc buffers
Only a few relocations are typically used, so don't clear the
whole thing.
2008-05-17 23:34:47 -07:00
Dave Airlie
126673261d r500: you can have a single texcoord 2008-05-18 15:25:08 +10:00
Corbin Simpson
0910d9d4d6 r5xx: Add OPCODE_KIL. 2008-05-17 13:38:35 -07:00
Corbin Simpson
c57b3b1d2c r5xx: Added OPCODE_DPH.
Like DP4, but with one swizzle change.
2008-05-17 12:45:46 -07:00
Corbin Simpson
6dd3c0ed96 r5xx: Fix FRC.
This makes tri-frc work.
(Remind me again why I'm allowed near a compiler, lawl.)
2008-05-17 09:27:35 -07:00
Corbin Simpson
16cc362f0b r5xx: Fix SCS.
Output instructions need to be marked OUT so they can write to the fifo.
Also, negation doesn't work with SWZ yet.
2008-05-17 07:12:38 -07:00
Corbin Simpson
c11a33fe76 r5xx: Add OPCODE_SWZ.
It's so easy!
2008-05-17 07:12:37 -07:00