OSDN Git Service
Roland Scheidegger [Thu, 19 Jul 2007 16:11:48 +0000 (18:11 +0200)]
remove some more really old ifdefed out code...
Roland Scheidegger [Thu, 19 Jul 2007 15:42:14 +0000 (17:42 +0200)]
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...
Roland Scheidegger [Thu, 19 Jul 2007 14:41:14 +0000 (16:41 +0200)]
fix drawables not getting freed if context is made current with new drawables
Roland Scheidegger [Wed, 18 Jul 2007 18:17:14 +0000 (20:17 +0200)]
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.
Roland Scheidegger [Wed, 18 Jul 2007 16:07:12 +0000 (18:07 +0200)]
more fixes for mesa's fbo handling (fixes tests/fbotest1/2)
Roland Scheidegger [Wed, 18 Jul 2007 13:18:43 +0000 (15:18 +0200)]
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.
Roland Scheidegger [Tue, 17 Jul 2007 18:06:44 +0000 (20:06 +0200)]
get rid of checks for old ddx
Roland Scheidegger [Tue, 17 Jul 2007 17:49:25 +0000 (19:49 +0200)]
remove some more old stuff
Roland Scheidegger [Tue, 17 Jul 2007 17:37:05 +0000 (19:37 +0200)]
get rid of more pageflip/rotation code.
Roland Scheidegger [Tue, 17 Jul 2007 17:22:23 +0000 (19:22 +0200)]
fix up mesa's probably bogus framebuffer updates with different read/write fbs
Roland Scheidegger [Tue, 17 Jul 2007 15:29:55 +0000 (17:29 +0200)]
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).
Roland Scheidegger [Tue, 17 Jul 2007 13:56:43 +0000 (15:56 +0200)]
remove old code, remaining bits of static handles, disable (no longer functional anyway) rotation code
Roland Scheidegger [Tue, 17 Jul 2007 10:56:30 +0000 (12:56 +0200)]
increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)
Roland Scheidegger [Mon, 16 Jul 2007 18:53:33 +0000 (20:53 +0200)]
fix resize bugs (fb size updated too late), fix typos, cleanups...
Roland Scheidegger [Mon, 16 Jul 2007 17:01:47 +0000 (19:01 +0200)]
small cleanups
Roland Scheidegger [Mon, 16 Jul 2007 15:41:22 +0000 (17:41 +0200)]
get rid of more cliprects...
Roland Scheidegger [Mon, 16 Jul 2007 13:53:23 +0000 (15:53 +0200)]
more cliprect elimination (swrast span)
Roland Scheidegger [Mon, 16 Jul 2007 13:33:09 +0000 (15:33 +0200)]
get rid of more fake cliprects (drawpixel), and enable blit draw with scissor
Roland Scheidegger [Mon, 16 Jul 2007 11:57:49 +0000 (13:57 +0200)]
get rid of more cliprects (readpixel)...
Roland Scheidegger [Mon, 16 Jul 2007 09:51:08 +0000 (11:51 +0200)]
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).
Roland Scheidegger [Sun, 15 Jul 2007 20:53:59 +0000 (22:53 +0200)]
change back driver change from previous commit
Roland Scheidegger [Sun, 15 Jul 2007 20:47:42 +0000 (22:47 +0200)]
fix bogus fb/drawable information (fixes xdemos/wincopy)
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 may 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).
Roland Scheidegger [Sun, 15 Jul 2007 18:15:19 +0000 (20:15 +0200)]
fix the texture copypixels path
Roland Scheidegger [Sun, 15 Jul 2007 16:17:36 +0000 (18:17 +0200)]
begin getting rid of fake clip rects (copy_pixel)
Roland Scheidegger [Sat, 14 Jul 2007 12:24:20 +0000 (14:24 +0200)]
fix assertion, z/stencil swarst readback, (still looks suspicious) copyTexSubimage
Roland Scheidegger [Fri, 13 Jul 2007 18:47:17 +0000 (20:47 +0200)]
bugfixes (wrt fb updates), cleanups
move drawable validation back to where it was now that the driDrawable
information isn't used directly anymore.
Fix bogus fb updates (the context we get for SwapBuffer processing
may not have the drawable being processed attached!)
glthreads behaves a bit better but still not correct.
Roland Scheidegger [Thu, 12 Jul 2007 19:52:02 +0000 (21:52 +0200)]
don't use driDrawable information directly, don't resize at makecurrent
driDrawable information now isn't used in most parts of the driver.
makecurrent only updates fb information when the context is new
(driDrawable is still updated by the dri common code).
Roland Scheidegger [Wed, 11 Jul 2007 18:18:51 +0000 (20:18 +0200)]
restrict blitted area to size of rendered area
Keith Whitwell [Wed, 11 Jul 2007 16:01:30 +0000 (17:01 +0100)]
Fix screen corruption on resize.
Move buffer resize check to immediately after swapbuffers.
Update cliprects inside the locked region of swapbuffers.
Roland Scheidegger [Wed, 11 Jul 2007 15:30:01 +0000 (17:30 +0200)]
remove bogus assertion, change drawable updates
don't update driDrawable information until later at all
(blit needs fixing).
Roland Scheidegger [Wed, 11 Jul 2007 14:08:14 +0000 (16:08 +0200)]
drop some more code no longer needed
Roland Scheidegger [Wed, 11 Jul 2007 12:20:39 +0000 (14:20 +0200)]
some fixes, fake frontbuffer
still doesn't work quite right (resize).
Fake frontbuffer doesn't copy in real frontbuffer.
Don't even think about doing rotation/page flip/triple buffering for now...
More cleanups needed (fake cliprects etc.)
Roland Scheidegger [Tue, 10 Jul 2007 17:56:44 +0000 (19:56 +0200)]
copybuffer/cliprect fixups
Roland Scheidegger [Tue, 10 Jul 2007 16:07:38 +0000 (18:07 +0200)]
First attempt at using private back/z buffers.
Allocate and use private back and z/stencil buffers.
This is still very broken.
Dave Airlie [Wed, 4 Jul 2007 05:29:31 +0000 (15:29 +1000)]
r300: only init swtcl on tcl-less cards
Brian [Tue, 3 Jul 2007 17:41:56 +0000 (11:41 -0600)]
added vec2(vec4) constructor, bug 11404
Brian [Tue, 3 Jul 2007 17:41:21 +0000 (11:41 -0600)]
add code for stpq, rgba writemasks in make_writemask(), bug 11404
Brian [Tue, 3 Jul 2007 16:06:13 +0000 (10:06 -0600)]
fix StepX/StepY typo
Brian [Tue, 3 Jul 2007 14:53:49 +0000 (08:53 -0600)]
use _mesa_unpack_stencil_span() in draw_stencil_pixels(), bug 11457
Roland Scheidegger [Tue, 3 Jul 2007 12:27:41 +0000 (14:27 +0200)]
fix GL_DOT3_RGBA texture combiner mode in generated fragment programs (bug #11030)
Brian [Mon, 2 Jul 2007 16:16:02 +0000 (10:16 -0600)]
add const to wglSetPixelFormat() to match .h declaration
Brian [Mon, 2 Jul 2007 14:46:57 +0000 (08:46 -0600)]
avoid unnecessary clamping of depth values (bug 11448)
Dave Airlie [Mon, 2 Jul 2007 07:21:45 +0000 (17:21 +1000)]
r300: fix compiz crash on swtcl - doesn't fix compiz though.
Compiz for some reason looks like ass, everything with textures
looks like it has a 2x width/height multiplier on the texture coords...
Claudio Ciccani [Sun, 1 Jul 2007 10:24:44 +0000 (12:24 +0200)]
Compute the amount of time to sleep on idle event using timers as reference.
Claudio Ciccani [Sun, 1 Jul 2007 10:23:12 +0000 (12:23 +0200)]
Fixed initialization of render buffer and deinitialization of context.
Dave Airlie [Sun, 1 Jul 2007 09:27:26 +0000 (19:27 +1000)]
r300: oops wrong logic for swtcl
Dave Airlie [Sun, 1 Jul 2007 08:52:47 +0000 (18:52 +1000)]
r300: oops turn back off cmd buf debugging
Dave Airlie [Sun, 1 Jul 2007 08:50:14 +0000 (18:50 +1000)]
Merge branch 'r300-swtcl'
Dave Airlie [Sun, 1 Jul 2007 08:46:39 +0000 (18:46 +1000)]
fix tabbing
Dave Airlie [Sun, 1 Jul 2007 08:43:22 +0000 (18:43 +1000)]
r300: add authorship
Dave Airlie [Sun, 1 Jul 2007 08:42:27 +0000 (18:42 +1000)]
r300: remove some unused code
Dave Airlie [Sun, 1 Jul 2007 08:40:26 +0000 (18:40 +1000)]
r300: cleanup some of the swtcl code
Dave Airlie [Sun, 1 Jul 2007 08:29:23 +0000 (18:29 +1000)]
r300: fixup manytex, we needed to emit the vic/vir/vof every time
Dave Airlie [Sun, 1 Jul 2007 07:15:50 +0000 (17:15 +1000)]
r300: fix tabbing
Brian [Sat, 30 Jun 2007 03:52:18 +0000 (21:52 -0600)]
simplify INIT_SPAN code
Brian [Sat, 30 Jun 2007 03:33:59 +0000 (21:33 -0600)]
s/SPAN_RGBA/SPAN_INDEX/ in clear_ci_buffer_with_masking()
Brian [Sat, 30 Jun 2007 03:29:30 +0000 (21:29 -0600)]
Undo some prev glDraw/CopyPixel changes which fixed a bug in which colors were overwritten by interpolating attributes.
Now just set the span->arrayAttribs mask in glDraw/CopyPixels and be sure
we don't overwrite the values in interpolate_active_attribs().
Brian [Sat, 30 Jun 2007 03:13:20 +0000 (21:13 -0600)]
Obsolete
Brian [Sat, 30 Jun 2007 03:12:46 +0000 (21:12 -0600)]
overhaul point rasterization, no longer use s_pointtemp.h
Brian [Fri, 29 Jun 2007 13:52:43 +0000 (07:52 -0600)]
regenerated
Ben Skeggs [Sat, 9 Jun 2007 17:05:05 +0000 (03:05 +1000)]
nouveau: match drm changes (0.0.7)
Ben Skeggs [Fri, 8 Jun 2007 03:27:57 +0000 (13:27 +1000)]
nouveau: NV30_TCL viewport/scissor fixes
Brian [Thu, 28 Jun 2007 22:44:24 +0000 (16:44 -0600)]
bring over 7.0 doc changes
Brian [Thu, 28 Jun 2007 22:34:40 +0000 (16:34 -0600)]
Add a few missing GL 2.0 entrypoints, regenerate related files.
Specifically:
glVertexAttrib4bv
glVertexAttrib4iv
glVertexAttrib4ubv
glVertexAttrib4uiv
glVertexAttrib4usv
zhang [Thu, 28 Jun 2007 14:12:52 +0000 (08:12 -0600)]
a variety of fixes for MingW
Brian [Thu, 28 Jun 2007 13:18:43 +0000 (07:18 -0600)]
remove t_save_api.c and some other obsolete files, may be more
Brian [Thu, 28 Jun 2007 13:15:37 +0000 (07:15 -0600)]
remove obsolete t_save_api.c
Brian [Thu, 28 Jun 2007 13:15:11 +0000 (07:15 -0600)]
use larger point/sprite size
Brian [Thu, 28 Jun 2007 13:13:39 +0000 (07:13 -0600)]
increase MAX_POINT_SIZE to 60
Brian [Thu, 28 Jun 2007 13:13:20 +0000 (07:13 -0600)]
XXX comment about point clamping
Brian [Thu, 28 Jun 2007 13:12:55 +0000 (07:12 -0600)]
added comment, remove dead code
Oliver McFadden [Wed, 20 Jun 2007 14:24:04 +0000 (14:24 +0000)]
r300: Initial work on merging the real and generated vertex program functions.
Oliver McFadden [Wed, 20 Jun 2007 12:42:19 +0000 (12:42 +0000)]
r300: Should use inst_count not 0 for R300_PVS_CNTL_3_PROGRAM_UNKNOWN_SHIFT.
Oliver McFadden [Wed, 20 Jun 2007 12:23:47 +0000 (12:23 +0000)]
r300: The vpi, vpp, and vps counts are already initialized; don't do it twice.
Oliver McFadden [Wed, 20 Jun 2007 12:13:44 +0000 (12:13 +0000)]
r300: Clean up the vertex program state code slightly; still needs lots of work.
Oliver McFadden [Wed, 20 Jun 2007 12:03:42 +0000 (12:03 +0000)]
r300: Vertex program position end bits are known.
Possibly performance may improve by setting it to the last instruction that
writes result.position, rather than the last instruction in the vertex program.
Oliver McFadden [Wed, 20 Jun 2007 11:45:07 +0000 (11:45 +0000)]
r300: Removed unused vap_param structure.
Oliver McFadden [Wed, 20 Jun 2007 11:42:53 +0000 (11:42 +0000)]
r300: Cleaned up long lines in the vertex functions.
Oliver McFadden [Wed, 20 Jun 2007 03:02:34 +0000 (03:02 +0000)]
r300: Setup the default state for polygon offset point/line.
I believe there are still bugs with all polygon offset types. The point and line
types may need to be handled specially, too.
This shouldn't break anything because it just enabled the occlusion control bits
for polygon offset.
Oliver McFadden [Wed, 20 Jun 2007 02:37:44 +0000 (02:37 +0000)]
r300: Cleaned up the r300SetupVertexShader function.
Oliver McFadden [Wed, 20 Jun 2007 02:31:35 +0000 (02:31 +0000)]
r300: Cleaned up the r300SetupPixelShader function.
Oliver McFadden [Sun, 17 Jun 2007 02:04:58 +0000 (02:04 +0000)]
r300: Trivial clean up in radeon_lock.h.
Dave Airlie [Sun, 24 Jun 2007 07:21:26 +0000 (17:21 +1000)]
r300: 2288 is a tcl only reg
Eric Anholt [Fri, 22 Jun 2007 17:29:54 +0000 (10:29 -0700)]
Use -pthread instead of -lpthread on FreeBSD.
Brian [Fri, 22 Jun 2007 15:47:30 +0000 (09:47 -0600)]
fix bug rendering points with fragment program (see #11330)
Brian [Fri, 22 Jun 2007 14:02:46 +0000 (08:02 -0600)]
Fix feedback color bug #11332. In feedback mode, produce float colors.
Dave Airlie [Fri, 22 Jun 2007 09:18:04 +0000 (19:18 +1000)]
clean up cache flush emission into one place
makes gears work with swtcl
Brian [Fri, 22 Jun 2007 00:11:29 +0000 (18:11 -0600)]
Random state-change / primitive rendering. Good for hammering on a driver...
Brian [Thu, 21 Jun 2007 22:06:06 +0000 (16:06 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Thu, 21 Jun 2007 22:04:02 +0000 (16:04 -0600)]
fix rgba pointer bug hit on zoomed+fogged glDrawPixels
Brian [Thu, 21 Jun 2007 22:04:04 +0000 (16:04 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Oliver McFadden [Thu, 21 Jun 2007 15:53:26 +0000 (15:53 +0000)]
r300: Corrected a bug in r300LineWidth.
Thanks to Panagiotis Papadakos for reporting it.
Brian [Thu, 21 Jun 2007 15:15:32 +0000 (09:15 -0600)]
Another round of fixing attribute interpolation for glDraw/CopyPixels.
Need to turn off FRAG_BIT_COL0 in swrast->_ActiveAttribMask when doing
glRead/CopyPixels to prevent the user's colors from getting overwritten
when a fragment program is active.
This was happening in the DRI drivers when MaintainTexEnv program was
used (the texenv fragment program was enabled when _swrast_DrawPixels was
called).
This still isn't an ideal solution, but fixes things for now.
Brian [Thu, 21 Jun 2007 15:11:43 +0000 (09:11 -0600)]
rename _swrast_update_fragment_attribs()
Dave Airlie [Thu, 21 Jun 2007 08:35:25 +0000 (18:35 +1000)]
clean up color0 code
Dave Airlie [Thu, 21 Jun 2007 08:35:00 +0000 (18:35 +1000)]
add a mem use for current dma buffer
Dave Airlie [Thu, 21 Jun 2007 05:07:31 +0000 (15:07 +1000)]
fix unfilled tris/quads
Dave Airlie [Thu, 21 Jun 2007 04:43:53 +0000 (14:43 +1000)]
ensure cmd buffer space
Dave Airlie [Thu, 21 Jun 2007 04:20:33 +0000 (14:20 +1000)]
fix up vertex emission before state change
Dave Airlie [Thu, 21 Jun 2007 00:59:11 +0000 (10:59 +1000)]
fix secondary color, fog is off for now