Brian Paul [Wed, 28 May 2008 15:06:28 +0000 (09:06 -0600)]
updated function list
Brian Paul [Wed, 28 May 2008 14:53:32 +0000 (08:53 -0600)]
replace make with $(MAKE) (bug 16133)
Dave Airlie [Wed, 28 May 2008 00:23:25 +0000 (10:23 +1000)]
r300: disable cmdbuf debug again
Dave Airlie [Wed, 28 May 2008 00:20:14 +0000 (10:20 +1000)]
Merge branch 'r500-support'
Bring in all the r500 3D code into master should be as stable as the r300
code it is landing on top off.
Conflicts:
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Dave Airlie [Wed, 28 May 2008 00:07:30 +0000 (10:07 +1000)]
r500: remove warnings and only start on newer drms.
This removes lots of warnings to the user, and only allows the driver
to run on > .29 drms for r500 cards.
Alex Deucher [Wed, 28 May 2008 00:11:14 +0000 (10:11 +1000)]
R3/4/5xx: update to use drm get_param for num gb pipes
Dave Airlie [Wed, 28 May 2008 00:03:10 +0000 (10:03 +1000)]
r500: cleanup warnings and include files
Brian Paul [Tue, 27 May 2008 19:27:57 +0000 (13:27 -0600)]
update, re-org build/install instructions
Brian Paul [Tue, 27 May 2008 18:51:37 +0000 (12:51 -0600)]
set version string to 7.1 rc1
Brian Paul [Tue, 27 May 2008 18:51:10 +0000 (12:51 -0600)]
updates for 7.1 release
Brian Paul [Tue, 27 May 2008 18:50:59 +0000 (12:50 -0600)]
prep for 7.1 RC1
Brian Paul [Tue, 27 May 2008 15:49:18 +0000 (09:49 -0600)]
allow GLX_SAMPLES_ARB==0 (bug 16073)
Jouk Jansen [Tue, 27 May 2008 14:58:39 +0000 (08:58 -0600)]
updated for latest sources
Karl Schultz [Tue, 27 May 2008 14:48:25 +0000 (08:48 -0600)]
dependency fixes (bug 13544)
Corbin Simpson [Tue, 27 May 2008 09:12:10 +0000 (02:12 -0700)]
r5xx: Add OPCODE_XPD. In working condition, I might add.
And we're officially finished with the ARB_fragment_program
instruction set. It's worth noting that LIT is still not reliable.
SIN and COS were fixed a few commits ago. We're finished with stage 1!
Whoohoo!
Corbin Simpson [Tue, 27 May 2008 08:01:46 +0000 (01:01 -0700)]
r5xx: Just a few small LIT fixes.
Still broken; will fix tomorrow.
Corbin Simpson [Tue, 27 May 2008 05:34:32 +0000 (22:34 -0700)]
r5xx: Fix emit_mov() regression.
Specifically, fix improper swizzling.
Dave Airlie [Tue, 27 May 2008 08:15:14 +0000 (18:15 +1000)]
r500: the cs is shared per context - doh so don't use for program upload.
Also remove some unused bits of the r500 fragprog struct
Dave Airlie [Tue, 27 May 2008 07:39:35 +0000 (17:39 +1000)]
r500: need to re-setup inst offset/end for translated programs
this fixes texenv
Dave Airlie [Tue, 27 May 2008 07:11:04 +0000 (17:11 +1000)]
r500: reset fp/fp_const counts
Dave Airlie [Tue, 27 May 2008 07:08:03 +0000 (17:08 +1000)]
r300/r500: emit flush inside vap_cntl state atom
Not sure if this is a good or bad plan, it certainly doesn't make things worse here.
Dave Airlie [Tue, 27 May 2008 05:29:39 +0000 (15:29 +1000)]
r500: hopefully fix 4096 texture harder
Corbin Simpson [Tue, 27 May 2008 05:12:24 +0000 (22:12 -0700)]
r5xx: Fix FP temp counting.
One of the ref counters wasn't being added to the temp counter.
Yet another product of late-night coding...
Dave Airlie [Tue, 27 May 2008 02:46:44 +0000 (12:46 +1000)]
r500: remove debugging
Dave Airlie [Tue, 27 May 2008 02:45:15 +0000 (12:45 +1000)]
r300/r500: fix r500 fragment program texture unit references
Dave Airlie [Tue, 27 May 2008 00:59:42 +0000 (10:59 +1000)]
r500: initial support for tmu mappings
Corbin Simpson [Mon, 26 May 2008 23:00:05 +0000 (16:00 -0700)]
r5xx: Enhance emit_mov().
Now we can add arbitrary sources and swizzles. Will make many things smoother.
Corbin Simpson [Mon, 26 May 2008 22:18:41 +0000 (15:18 -0700)]
r5xx: Moar LIT.
Still not working, but getting closer.
Corbin Simpson [Mon, 26 May 2008 19:35:39 +0000 (12:35 -0700)]
r5xx: First stab at LIT.
Corbin Simpson [Mon, 26 May 2008 05:50:00 +0000 (22:50 -0700)]
Replace copyright on r500_fragprog.c
Huh, could have sworn I already did this once before...
Maybe I forgot to commit it?
Corbin Simpson [Mon, 26 May 2008 02:53:48 +0000 (19:53 -0700)]
r5xx: Unbreak texture swizzling.
Corbin Simpson [Sun, 25 May 2008 18:46:16 +0000 (11:46 -0700)]
r5xx: Massive MAD cleanup.
Common uses of MAD now use emit_mad(), the two common negation masks work,
and fixed a few off-by-one errors.
Corbin Simpson [Sun, 25 May 2008 18:35:54 +0000 (11:35 -0700)]
r5xx: Negation masks for every inst except SWZ.
Yay?
Corbin Simpson [Sun, 25 May 2008 18:35:20 +0000 (11:35 -0700)]
r5xx: More emit_alu().
Converted ADD.
Corbin Simpson [Sun, 25 May 2008 18:07:51 +0000 (11:07 -0700)]
r5xx: Add emit_mad() for FP.
If it uses MAD, emit it with emit_mad()!
(Now available at your local grocer's. Multiply and add responsibly.)
Corbin Simpson [Sat, 24 May 2008 18:30:57 +0000 (11:30 -0700)]
r5xx: Consolidate FP tex insts.
They're all the same, really.
Corbin Simpson [Sat, 24 May 2008 16:17:28 +0000 (09:17 -0700)]
r5xx: Fix SGE/SLT.
Corbin Simpson [Fri, 23 May 2008 09:05:24 +0000 (02:05 -0700)]
r5xx: Remove some debugging cruft.
Tormod Volden [Sat, 24 May 2008 16:32:03 +0000 (18:32 +0200)]
dri: vblank_mode warning
From what I can see the environment variables LIBGL_THROTTLE_REFRESH
and LIBGL_SYNC_REFRESH were taken out like 3 years ago, but this
warning was never updated.
Dave Airlie [Sat, 24 May 2008 08:18:18 +0000 (18:18 +1000)]
r500: missed a couple of inst4s.
Dave Airlie [Sat, 24 May 2008 08:12:26 +0000 (18:12 +1000)]
r500: add depth output write
Not sure how well this works yet, but we need to set the alpha to w_omask
George Sapountzis [Fri, 23 May 2008 19:55:36 +0000 (22:55 +0300)]
dri/swrast: cosmetic, mainly generic vs. xorg terminology
George Sapountzis [Fri, 23 May 2008 19:55:12 +0000 (22:55 +0300)]
dri/swrast: add dithering support
George Sapountzis [Fri, 23 May 2008 19:54:54 +0000 (22:54 +0300)]
dri/swrast: add support for r3g3b2
George Sapountzis [Fri, 23 May 2008 19:52:52 +0000 (22:52 +0300)]
dri: add support for generating 3_3_2 configs
George Sapountzis [Fri, 23 May 2008 19:52:36 +0000 (22:52 +0300)]
dri/swrast: split out common pixel macros
George Sapountzis [Fri, 23 May 2008 19:52:19 +0000 (22:52 +0300)]
dri/swrast: drop TODO list
George Sapountzis [Fri, 23 May 2008 19:48:55 +0000 (22:48 +0300)]
drop GLcore
Corbin Simpson [Fri, 23 May 2008 07:16:49 +0000 (00:16 -0700)]
r5xx: Clean up some compiler warnings.
Corbin Simpson [Fri, 23 May 2008 07:14:31 +0000 (00:14 -0700)]
r5xx: Move dumb_shader.
Was getting ticked having to scroll around it, lawl.
Corbin Simpson [Fri, 23 May 2008 07:12:37 +0000 (00:12 -0700)]
r5xx: Add OPCODE_DST.
Works completely, swizzles and everything.
Corbin Simpson [Thu, 22 May 2008 09:34:57 +0000 (02:34 -0700)]
r5xx: More trig work.
SCS now works. COS/SIN have slight issues still.
Dave Airlie [Thu, 22 May 2008 07:09:30 +0000 (17:09 +1000)]
r500: bump state atom size up for fp and fp constants
Corbin Simpson [Thu, 22 May 2008 06:35:43 +0000 (23:35 -0700)]
r5xx: Fixed LRP.
Works perfectly. It's a complex one, though, so it might fail in weird ways...
Corbin Simpson [Thu, 22 May 2008 06:33:13 +0000 (23:33 -0700)]
r5xx: Change debug info for readability.
It's weird seeing the compiled program before the assembly, that's all.
Jesse Barnes [Wed, 21 May 2008 22:36:08 +0000 (15:36 -0700)]
Add cscope files to .gitignore
Corbin Simpson [Wed, 21 May 2008 20:51:32 +0000 (13:51 -0700)]
r5xx: Initial (broken) OPCODE_LRP.
Will compile, run, and not eat your kids, but the math is wrong.
Dan Nicholson [Wed, 21 May 2008 17:55:49 +0000 (10:55 -0700)]
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.
Kristian Høgsberg [Wed, 21 May 2008 16:04:33 +0000 (12:04 -0400)]
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.
Kristian Høgsberg [Wed, 21 May 2008 15:59:23 +0000 (11:59 -0400)]
Make the shared glapi files not include glheader.h.
Kristian Høgsberg [Tue, 20 May 2008 21:06:19 +0000 (17:06 -0400)]
Revert "glapi: Generate xserver glapi sources in the mesa tree"
This reverts commit
7688791fc52f116eea421fda1d17aba5cf10977b, and takes
us back to generating the glapi files straight into the xserver tree.
Conflicts:
src/glx/x11/indirect_size_get.c
Corbin Simpson [Wed, 21 May 2008 15:24:28 +0000 (08:24 -0700)]
r5xx: Add OPCODE_POW.
Necessary for Google Earth, among other things.
George Sapountzis [Wed, 21 May 2008 15:21:50 +0000 (18:21 +0300)]
dri/swrast: use Makefile.template
George Sapountzis [Wed, 21 May 2008 15:20:54 +0000 (18:20 +0300)]
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
George Sapountzis [Wed, 21 May 2008 15:19:49 +0000 (18:19 +0300)]
dri/swrast: re-indent FillInModes
Brian [Wed, 21 May 2008 13:05:29 +0000 (07:05 -0600)]
added readtex.h dependency
Dave Airlie [Wed, 21 May 2008 06:00:18 +0000 (16:00 +1000)]
r500: print out opcode string
Dave Airlie [Wed, 21 May 2008 02:14:42 +0000 (12:14 +1000)]
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.
Dave Airlie [Wed, 21 May 2008 00:49:26 +0000 (10:49 +1000)]
r500: finish main texture instruction decoding
George Sapountzis [Sun, 11 May 2008 11:43:40 +0000 (14:43 +0300)]
Add DRI driver that uses the mesa swrast module.
George Sapountzis [Sun, 11 May 2008 11:43:22 +0000 (14:43 +0300)]
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.
Brian Paul [Tue, 20 May 2008 17:29:16 +0000 (11:29 -0600)]
copy StateFlags in _mesa_clone_parameter_list()
Brian Paul [Tue, 20 May 2008 17:01:17 +0000 (11:01 -0600)]
new multi-texture GLSL test
Brian Paul [Tue, 20 May 2008 16:59:18 +0000 (10:59 -0600)]
fix incorrect sampler numbering/indexing.
All samplers indexes were zero.
Corbin Simpson [Tue, 20 May 2008 16:47:50 +0000 (09:47 -0700)]
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.
Corbin Simpson [Tue, 20 May 2008 06:55:59 +0000 (23:55 -0700)]
r5xx: Fixup SOP insts.
Use the correct swizzle for alpha/SOP stuff.
Corbin Simpson [Mon, 19 May 2008 19:26:04 +0000 (12:26 -0700)]
r5xx: New fix for COS/SIN/SCS.
Not perfect yet, but getting better.
Dave Airlie [Tue, 20 May 2008 06:30:36 +0000 (16:30 +1000)]
r300/r500: fixup some of the register write sizes
Dave Airlie [Tue, 20 May 2008 06:02:19 +0000 (16:02 +1000)]
r300: some ctrl-m's wierd.
Dave Airlie [Tue, 20 May 2008 05:59:56 +0000 (15:59 +1000)]
r300/r500: fix RS col fmt bits
Xiang, Haihao [Tue, 20 May 2008 05:28:42 +0000 (13:28 +0800)]
i965: Check fallback before accounting for index/vertex buffer size. fix #16028.
Brian Paul [Mon, 19 May 2008 22:03:43 +0000 (16:03 -0600)]
fix tempReg test in _mesa_combine_programs()
Corbin Simpson [Mon, 19 May 2008 18:01:00 +0000 (11:01 -0700)]
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.
Brian Paul [Mon, 19 May 2008 14:43:36 +0000 (08:43 -0600)]
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.
Dave Airlie [Mon, 19 May 2008 11:58:28 +0000 (21:58 +1000)]
r500: add more input srcs
Dave Airlie [Mon, 19 May 2008 11:40:40 +0000 (21:40 +1000)]
r500: fix swz gets and some returns
Dave Airlie [Mon, 19 May 2008 11:11:55 +0000 (21:11 +1000)]
r500: add mask debugging
Dave Airlie [Mon, 19 May 2008 10:24:09 +0000 (20:24 +1000)]
r500: add fragment program debug dumper
Corbin Simpson [Mon, 19 May 2008 07:00:08 +0000 (00:00 -0700)]
r5xx: Fix magic offsets for output fifo write masks.
Well, this sure explains a lot.
Corbin Simpson [Mon, 19 May 2008 06:52:54 +0000 (23:52 -0700)]
r5xx: Swap sources for CMP.
Follows the same pattern as the op on r3xx/r4xx. Thanks airlied.
Corbin Simpson [Mon, 19 May 2008 06:35:07 +0000 (23:35 -0700)]
r5xx: Fix typo of epic proportions.
Corbin Simpson [Mon, 19 May 2008 05:38:28 +0000 (22:38 -0700)]
r5xx: ALU/OUT fixups.
Lots of small changes. Intentionally breaks some tex stuffs.
Brian Paul [Sun, 18 May 2008 22:04:55 +0000 (16:04 -0600)]
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
Brian Paul [Sun, 18 May 2008 21:55:24 +0000 (15:55 -0600)]
additional fog/color matrix changes from gallium-0.1
Brian Paul [Sun, 18 May 2008 21:52:13 +0000 (15:52 -0600)]
add state vars for color matrix, pixel transfer scale&bias
cherry-picked from gallium-0.1 (
068c7bd912283e051a55b2fd5c4568685d10f3ed)
Brian Paul [Sun, 18 May 2008 21:50:20 +0000 (15:50 -0600)]
mesa: added internal post color matrix scale/bias vars
cherry-picked from gallium-0.1 (
302daeb2ec62c59bd28d0c53cdc0fb07dc9d0f58)
Brian Paul [Sun, 18 May 2008 21:46:26 +0000 (15:46 -0600)]
fixes to _mesa_combine_programs(), from gallium-0.1
Brian Paul [Sun, 18 May 2008 21:41:36 +0000 (15:41 -0600)]
added div by zero check for Fog.End/Start (from gallium-0.1)
Brian Paul [Sun, 18 May 2008 21:41:01 +0000 (15:41 -0600)]
clean-ups / additions from gallium-0.1 branch
Dave Airlie [Sun, 18 May 2008 07:58:29 +0000 (17:58 +1000)]
r300: fixup US_OUT_FMT bits