Commit graph

11316 commits

Author SHA1 Message Date
Brian
9110dbd9b2 simple fragment shader test 2007-07-24 10:00:29 -06:00
Brian
47fafcf06f use enabled/linked fragment shader in preference to a fragment program 2007-07-24 09:58:19 -06:00
Brian
4477a01372 call ctx->Driver.NewProgram() instead of _mesa_new_program() 2007-07-24 09:57:26 -06:00
Brian
5b6858c023 call ctx->Driver.NewProgram() instead of _mesa_new_program() 2007-07-24 09:56:44 -06:00
Brian
ffc633c469 fix logic error, typos 2007-07-24 09:19:22 -06:00
Brian
5b737b7df2 Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch 2007-07-24 09:17:59 -06:00
Brian
da2f1e88bc fix GLX_STEREO handling (bug 11705) 2007-07-23 16:51:57 -06:00
michal
98eaf5503d Execute fs tokens.
Fix align128 bug.
2007-07-23 18:26:25 +02:00
Zhang
76fb808910 Fix a number of MINGW32 issues 2007-07-21 11:28:06 -06:00
Brian
af2aa8e9cf Remove ctx->Point._Size and ctx->Line._Width.
The clamping for these values depends on whether we're drawing AA or non-AA
points, lines.  Defer clamping until drawing time.  Drivers could compute and
keep clamped AA and clamped non-AA values if desired.
2007-07-21 10:06:41 -06:00
Brian
5842bc3bf9 remove VC6/VC7 project files until updated 2007-07-21 10:06:40 -06:00
Roland Scheidegger
36fce66034 set the _BaseFormat for window-framebuffers, could hit some assertion otherwise 2007-07-21 16:51:15 +02:00
Roland Scheidegger
82fceba231 fix bogus recently introduced function param comments 2007-07-20 11:47:06 +02:00
Roland Scheidegger
118bd626b1 fix bogus recently introduced function param comments 2007-07-20 11:34:26 +02:00
Roland Scheidegger
97cd87ef74 minor cleanups, disable debugging 2007-07-20 11:33:24 +02:00
Keith Whitwell
4824c342c8 Trigger tgsi compilation for fragment programs.
Not sure the generated program looks correct though...
2007-07-19 20:24:55 +01:00
Roland Scheidegger
e0850e52ee remove some more really old ifdefed out code... 2007-07-19 18:11:48 +02:00
Roland Scheidegger
a1bc0d0f51 fix mesa's handling of fbo's / window fb (again)
Make sure the relevant fields in window fbs get updated at appropriate time
(those are NOT the same as fbos!!!), and fix up related code accordingly.
This is a bit ugly, but there's a reason the issues section in EXT_fbo is
a couple hundred pages long...
Hopefully correct now.
2007-07-19 17:59:59 +02:00
Roland Scheidegger
6075df53b5 more fixes for mesa's fbo handling (fixes tests/fbotest1/2) 2007-07-19 17:59:31 +02:00
Roland Scheidegger
f9ac01eac5 fix up mesa's probably bogus framebuffer updates with different read/write fbs
Conflicts:

	src/mesa/main/framebuffer.c
2007-07-19 17:58:21 +02:00
Roland Scheidegger
dbfb375805 fix mesa fb binding
Make sure that we bind the right buffer (draw or read) when rebinding
the window framebuffer (the api doesn't allow binding different draw and
read buffers at the same time, but the default window framebuffer is basically
2 fb objects, one for read, one for write, which can be different). Pass both
of these two down the driver api (no driver uses this right now).
2007-07-19 17:47:14 +02:00
Roland Scheidegger
b9f2cf9a4e increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape) 2007-07-19 17:46:35 +02:00
Roland Scheidegger
79ddb7f9a2 more cleanups (looks pretty reasonable now)
remove some already ifdefed out, no longer functional and used code.
Don't do our own scissor clipping in the pixeldraw/copy paths,
as meas already does that for us...
2007-07-19 17:42:14 +02:00
Roland Scheidegger
da21eff86b fix drawables not getting freed if context is made current with new drawables 2007-07-19 16:41:14 +02:00
Roland Scheidegger
131a036312 fix mesa's handling of fbo's / window fb (again)
Make sure the relevant fields in window fbs get updated at appropriate time
(those are NOT the same as fbos!!!), and fix up related code accordingly.
This is a bit ugly, but there's a reason the issues section in EXT_fbo is
a couple hundred pages long...
Hopefully correct now.
2007-07-18 20:17:14 +02:00
Roland Scheidegger
3f318c2eb9 more fixes for mesa's fbo handling (fixes tests/fbotest1/2) 2007-07-18 18:07:12 +02:00
Roland Scheidegger
ccb713cdb8 swapbuffers with non-current contexts, cleanups
manywin got broken (when intelPageflip got no longer called).
Make sure that intelFlush is getting called when a context gets unbound,
to handle later swapbuffer calls on that context's drawable better.
Related, fix non-current cliprects getting used on unbound drawables.
2007-07-18 15:18:43 +02:00
Oliver McFadden
0b48ce450e r300: Oops, made a mistake on commit fb4e071bed. 2007-07-18 02:59:08 +00:00
Oliver McFadden
86ece0a920 r300: Cleaned up vertprog construction.
Construct the vertprog instruction in the 4 DWORD parts...

DWORD 0: Opcode and Output.
DWORD 1: First Argument.
DWORD 2: Second Argument.
DWORD 3: Third Argument.

Allow the opcode translation functions to generate more than one instruction;
useful for when an instruction must be emulated. FLR, XPD, etc.
2007-07-18 02:49:26 +00:00
Tommy Schultz Lassen
fb4e071bed r300: Corrected texcoord start when BFC1 is enabled. 2007-07-18 00:37:43 +00:00
Roland Scheidegger
c5a8bc7125 get rid of checks for old ddx 2007-07-17 20:06:44 +02:00
Roland Scheidegger
7664105fc2 remove some more old stuff 2007-07-17 19:49:25 +02:00
Roland Scheidegger
881d71495b get rid of more pageflip/rotation code. 2007-07-17 19:37:05 +02:00
Roland Scheidegger
a8bf93e00e fix up mesa's probably bogus framebuffer updates with different read/write fbs 2007-07-17 19:22:23 +02:00
Roland Scheidegger
d9499a151d fix mesa fb binding
Make sure that we bind the right buffer (draw or read) when rebinding
the window framebuffer (the api doesn't allow binding different draw and
read buffers at the same time, but the default window framebuffer is basically
2 fb objects, one for read, one for write, which can be different). Pass both
of these two down the driver api (no driver uses this right now).
2007-07-17 17:29:55 +02:00
Roland Scheidegger
04d49ff24d remove old code, remaining bits of static handles, disable (no longer functional anyway) rotation code 2007-07-17 15:56:43 +02:00
Roland Scheidegger
4dd8e2648d increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape) 2007-07-17 12:56:30 +02:00
Keith Whitwell
6101fe641c Merge branch 'origin' into softpipe_0_1_branch 2007-07-17 11:06:31 +01:00
Keith Whitwell
bb1b01616b Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch 2007-07-17 11:06:02 +01:00
Oliver McFadden
7b410f366f r300: Corrected some progs/fp/* regressions from the BFC patch.
I'm not completely sure this is correct; it restores the old behaviour.
2007-07-16 21:43:39 +00:00
Oliver McFadden
8a016d2130 r300: Use _mesa_num_inst_src_regs for number of arguments. 2007-07-16 20:24:41 +00:00
Oliver McFadden
f66775184b r300: Corrected vertprog FLR and XPD instruction regression. 2007-07-16 20:07:30 +00:00
Oliver McFadden
3eba764df8 r300: Added code for vertprog opcode ARL. 2007-07-16 19:20:32 +00:00
Oliver McFadden
611674ed69 r300: Don't need vertprog scalar flag anymore; it's handled explicitly... 2007-07-16 19:13:46 +00:00
Oliver McFadden
b89a5c6e06 r300: Removed broken RCC vertprog opcode. 2007-07-16 19:10:13 +00:00
Oliver McFadden
15f1609922 r300: More vertprog rework; give each opcode it's own function. 2007-07-16 19:09:29 +00:00
Roland Scheidegger
cc9cf90b09 fix resize bugs (fb size updated too late), fix typos, cleanups... 2007-07-16 20:53:33 +02:00
Roland Scheidegger
5fc7973d54 small cleanups 2007-07-16 19:01:47 +02:00
Oliver McFadden
39766010cd Revert "r300: Gracefully exit after GART memory is exhausted."
This reverts commit 9457bf62bb.

Causes the X server to die with Compiz and Beryl.
2007-07-16 16:37:38 +00:00
Oliver McFadden
cc85860ccb r300: Reorder the vertprog code to the ARB specification. 2007-07-16 16:37:38 +00:00