Zou Nan hai [Thu, 5 Jul 2007 03:10:24 +0000 (11:10 +0800)]
support "discard";
Zou Nan hai [Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)]
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
Zou Nan hai [Wed, 4 Jul 2007 02:51:57 +0000 (10:51 +0800)]
fix issue with output as src register.
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)
Zou Nan hai [Tue, 3 Jul 2007 07:27:43 +0000 (15:27 +0800)]
Fix a nasty bug...
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
Zou Nan hai [Thu, 21 Jun 2007 02:22:28 +0000 (10:22 +0800)]
support branch and loop in pixel shader
most of the sample working with some small modification
Dave Airlie [Thu, 21 Jun 2007 00:59:11 +0000 (10:59 +1000)]
fix secondary color, fog is off for now
Dave Airlie [Thu, 21 Jun 2007 00:50:27 +0000 (10:50 +1000)]
fix projtex
Dave Airlie [Thu, 21 Jun 2007 00:32:39 +0000 (10:32 +1000)]
fix quad-clip
Dave Airlie [Thu, 21 Jun 2007 00:19:00 +0000 (10:19 +1000)]
bring over vertex engine setup code from r300_Render and fix up
now have gears going.. + a few other trivial textured demoes
Brian [Wed, 20 Jun 2007 17:01:09 +0000 (11:01 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Wed, 20 Jun 2007 17:01:04 +0000 (11:01 -0600)]
Effectively disable _TexEnvProgram before calling _swrast_DrawPixels().
It's OK to use _TexEnvProgram regardless of the texture state, but if fog
is also enabled, the fragment program is lacking the actual fog computation
so fogging doesn't appear.
Fixing this might involve a new _MaintainFogProgram field and related code.
For now, just disable the _TexEnvProgram and let swrast handle everything.
Brian [Wed, 20 Jun 2007 16:56:13 +0000 (10:56 -0600)]
fix glDrawPixels + fragment program problem
Brian [Wed, 20 Jun 2007 16:55:31 +0000 (10:55 -0600)]
copy wpos attrib info into zoomed span (fixes fog perspective correction problem)
Dave Airlie [Wed, 20 Jun 2007 08:02:08 +0000 (18:02 +1000)]
fixup some bits of tcl path
Dave Airlie [Wed, 20 Jun 2007 08:01:47 +0000 (18:01 +1000)]
swtcl: gears works
Brian [Wed, 20 Jun 2007 00:50:26 +0000 (18:50 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Dave Airlie [Sun, 17 Jun 2007 09:55:13 +0000 (19:55 +1000)]
more commits to fix things and stuff - still not doing anything except crashin
Dave Airlie [Sun, 17 Jun 2007 05:44:42 +0000 (15:44 +1000)]
swtcl add debug and fix offset
Dave Airlie [Sun, 17 Jun 2007 05:05:43 +0000 (15:05 +1000)]
cleaned up reduced prim
Dave Airlie [Sun, 17 Jun 2007 04:47:09 +0000 (14:47 +1000)]
fixup packet setup - still hangs
Dave Airlie [Sun, 17 Jun 2007 04:27:58 +0000 (14:27 +1000)]
add missing swtcl file
Dave Airlie [Sun, 17 Jun 2007 04:17:11 +0000 (14:17 +1000)]
add more swtcl code to r300 - hangs card now
Michel Dänzer [Fri, 15 Jun 2007 13:24:35 +0000 (15:24 +0200)]
i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
Dave Airlie [Thu, 14 Jun 2007 05:26:39 +0000 (15:26 +1000)]
Initial r300 modes for swtcl it compiles!!
Stephane Marchesin [Wed, 13 Jun 2007 22:44:16 +0000 (00:44 +0200)]
nouveau: remove useless viewport xform with id matrix.
Dave Airlie [Wed, 13 Jun 2007 02:56:48 +0000 (12:56 +1000)]
move clip to r300 emit
Brian [Tue, 12 Jun 2007 23:17:43 +0000 (17:17 -0600)]
fix an error string, refactor _mesa_GetCompressedTexImageARB() to get rid of a goto
Brian [Tue, 12 Jun 2007 23:06:27 +0000 (17:06 -0600)]
fix make clean commands so missing subdirs don't cause infinite loops
Brian [Tue, 12 Jun 2007 21:16:21 +0000 (15:16 -0600)]
added memcpy() to-do item
Brian [Tue, 12 Jun 2007 21:08:43 +0000 (15:08 -0600)]
fix comment
Brian [Tue, 12 Jun 2007 15:47:03 +0000 (09:47 -0600)]
Fix TEXREL issues when using GLX_USE_TLS (see bug 7459).
Brian [Tue, 12 Jun 2007 14:57:12 +0000 (08:57 -0600)]
fix GLX_USE_TLS breakage, fix a warning
Brian [Mon, 11 Jun 2007 23:16:18 +0000 (17:16 -0600)]
Rework _mesa_update_texture_compare_function() to only be called during
state validation/update.
Note that we're still temporarily skipping the test for an active fragment
program. Need to fix shadow2D() ...
Brian [Mon, 11 Jun 2007 22:42:35 +0000 (16:42 -0600)]
rename/clean-up _mesa_validate_texture_wrap_mode
Brian [Mon, 11 Jun 2007 22:36:06 +0000 (16:36 -0600)]
fix typo, added comment
Brian [Mon, 11 Jun 2007 22:32:57 +0000 (16:32 -0600)]
Replace texobj->Complete with texobj->_Complete since it's a derived field.