Commit graph

115447 commits

Author SHA1 Message Date
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
Zou Nan hai
c6d042acc9 Fix SOP in fragment shader, brick is ok now. 2007-07-17 16:52:03 +08:00
Zou Nan hai
3c00cdc5f3 Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl 2007-07-17 15:42:39 +08:00
Zou Nan hai
24e7acd5e4 bumpmap sample is correct now 2007-07-17 11:25:37 +08:00
Zou Nan hai
719cf0b795 Use ProgramStringNotify 2007-07-17 11:19:52 +08: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
Roland Scheidegger
cbfe29cdee fix bogus fb/drawable information
the framebuffer objects attached to drawables can have invalidate state
associated with them, since for the window framebuffer this is per-context
state and not per-fbo state. Since drivers rely on that information
(otherwise would need to check if currently the window-framebuffer is
bound in a lot of places) fix it up in _mesa_make_current (ugly).
(Brought over from i915tex_privbuffers, where it fixes xdemos/wincopy
when switching to front buffer rendering.)
2007-07-16 18:23:47 +02:00
Roland Scheidegger
fb3b9060d4 fix segfault with i915 drivers in swrast drawpixels path when resizing windows 2007-07-16 18:23:46 +02:00
Oliver McFadden
d895c5a08f r300: Use the R300_PVS_UPLOAD_* defines. 2007-07-16 15:42:16 +00:00
Roland Scheidegger
894557d625 get rid of more cliprects... 2007-07-16 17:41:22 +02:00
Oliver McFadden
4013382ea2 r300: Added the clip plane upload defines. 2007-07-16 15:39:12 +00:00
Roland Scheidegger
56cbdfd7d5 more cliprect elimination (swrast span) 2007-07-16 15:53:23 +02:00
Roland Scheidegger
6104044f6b get rid of more fake cliprects (drawpixel), and enable blit draw with scissor 2007-07-16 15:33:09 +02:00
Oliver McFadden
81c333adbc r300: Enable the vertprog point size again. 2007-07-16 12:21:38 +00:00
Roland Scheidegger
8b93d9238e get rid of more cliprects (readpixel)... 2007-07-16 13:57:49 +02:00
Oliver McFadden
03105d7b3e r300: Corrected position bug with position invariant option. Bug #11594. 2007-07-16 11:34:40 +00:00
Roland Scheidegger
d69cae95a0 allow blit path for read pixels if pack->alignment isn't 1.
pack->alignment doesn't matter usually if the image is sufficiently aligned
anyway. Speeds up some tests/readrate cases by a factor of 100 (since
the pack->alignment default which noone ever bothers to change is 4).
2007-07-16 11:51:08 +02:00
Oliver McFadden
aa9d77ca3c r300: Removed Vim modeline I left in the file by mistake. :-) 2007-07-16 07:17:22 +00:00
Oliver McFadden
72581241a8 r300: Make sure the modified value of u_temp_i is respected. 2007-07-16 07:12:29 +00:00
Oliver McFadden
87855fb32c r300: Added a function for vertex program default opcode translation. 2007-07-16 06:38:12 +00:00