Brian [Tue, 24 Jul 2007 16:00:29 +0000 (10:00 -0600)]
simple fragment shader test
Brian [Tue, 24 Jul 2007 15:58:19 +0000 (09:58 -0600)]
use enabled/linked fragment shader in preference to a fragment program
Brian [Tue, 24 Jul 2007 15:57:26 +0000 (09:57 -0600)]
call ctx->Driver.NewProgram() instead of _mesa_new_program()
Brian [Tue, 24 Jul 2007 15:17:59 +0000 (09:17 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
michal [Mon, 23 Jul 2007 16:26:25 +0000 (18:26 +0200)]
Execute fs tokens.
Fix align128 bug.
Keith Whitwell [Thu, 19 Jul 2007 19:24:55 +0000 (20:24 +0100)]
Trigger tgsi compilation for fragment programs.
Not sure the generated program looks correct though...
Keith Whitwell [Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)]
Merge branch 'origin' into softpipe_0_1_branch
Keith Whitwell [Tue, 17 Jul 2007 10:06:02 +0000 (11:06 +0100)]
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
Oliver McFadden [Mon, 16 Jul 2007 21:43:39 +0000 (21:43 +0000)]
r300: Corrected some progs/fp/* regressions from the BFC patch.
I'm not completely sure this is correct; it restores the old behaviour.
Oliver McFadden [Mon, 16 Jul 2007 20:24:41 +0000 (20:24 +0000)]
r300: Use _mesa_num_inst_src_regs for number of arguments.
Oliver McFadden [Mon, 16 Jul 2007 20:07:30 +0000 (20:07 +0000)]
r300: Corrected vertprog FLR and XPD instruction regression.
Oliver McFadden [Mon, 16 Jul 2007 19:20:32 +0000 (19:20 +0000)]
r300: Added code for vertprog opcode ARL.
Oliver McFadden [Mon, 16 Jul 2007 19:13:46 +0000 (19:13 +0000)]
r300: Don't need vertprog scalar flag anymore; it's handled explicitly...
Oliver McFadden [Mon, 16 Jul 2007 19:10:13 +0000 (19:10 +0000)]
r300: Removed broken RCC vertprog opcode.
Oliver McFadden [Mon, 16 Jul 2007 19:09:29 +0000 (19:09 +0000)]
r300: More vertprog rework; give each opcode it's own function.
Oliver McFadden [Mon, 16 Jul 2007 16:21:21 +0000 (16:21 +0000)]
Revert "r300: Gracefully exit after GART memory is exhausted."
This reverts commit
9457bf62bbba3b9226ebbbea5dc7798ca22485f6.
Causes the X server to die with Compiz and Beryl.
Oliver McFadden [Mon, 16 Jul 2007 16:17:50 +0000 (16:17 +0000)]
r300: Reorder the vertprog code to the ARB specification.
Roland Scheidegger [Mon, 16 Jul 2007 16:21:36 +0000 (18:21 +0200)]
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.)
Roland Scheidegger [Mon, 16 Jul 2007 16:09:30 +0000 (18:09 +0200)]
fix segfault with i915 drivers in swrast drawpixels path when resizing windows
Oliver McFadden [Mon, 16 Jul 2007 15:42:16 +0000 (15:42 +0000)]
r300: Use the R300_PVS_UPLOAD_* defines.
Oliver McFadden [Mon, 16 Jul 2007 15:39:12 +0000 (15:39 +0000)]
r300: Added the clip plane upload defines.
Oliver McFadden [Mon, 16 Jul 2007 12:21:38 +0000 (12:21 +0000)]
r300: Enable the vertprog point size again.
Oliver McFadden [Mon, 16 Jul 2007 11:34:40 +0000 (11:34 +0000)]
r300: Corrected position bug with position invariant option. Bug #11594.
Oliver McFadden [Mon, 16 Jul 2007 07:17:22 +0000 (07:17 +0000)]
r300: Removed Vim modeline I left in the file by mistake. :-)
Oliver McFadden [Mon, 16 Jul 2007 07:12:29 +0000 (07:12 +0000)]
r300: Make sure the modified value of u_temp_i is respected.
Oliver McFadden [Mon, 16 Jul 2007 06:38:12 +0000 (06:38 +0000)]
r300: Added a function for vertex program default opcode translation.
Oliver McFadden [Mon, 16 Jul 2007 06:33:53 +0000 (06:33 +0000)]
r300: Clean up the vertex program maximum length check.
Oliver McFadden [Mon, 16 Jul 2007 06:27:29 +0000 (06:27 +0000)]
r300: Corrected indenting in r300_vertprog.c.
Oliver McFadden [Mon, 16 Jul 2007 06:16:35 +0000 (06:16 +0000)]
r300: Major vertex program code clean up and rework.
Oliver McFadden [Mon, 16 Jul 2007 05:04:10 +0000 (05:04 +0000)]
r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.
Oliver McFadden [Sun, 15 Jul 2007 01:17:54 +0000 (01:17 +0000)]
r300: Gracefully exit after GART memory is exhausted.
Oliver McFadden [Sat, 14 Jul 2007 18:31:29 +0000 (18:31 +0000)]
r300: Disable vertex program point size; it's almost certainly wrong.
See the conversation between myself and Tommy Schultz Lassen on mesa3d-dev.
Oliver McFadden [Sat, 14 Jul 2007 18:11:45 +0000 (18:11 +0000)]
r300: Clean up the vertex program output assignment.
Patrice Mandin [Sat, 14 Jul 2007 16:54:22 +0000 (18:54 +0200)]
nouveau: nv10 and nv11,15 are different
Jan Dvorak [Fri, 13 Jul 2007 22:36:00 +0000 (16:36 -0600)]
fix shader/info string length queries (bug 11588)
Brian [Fri, 13 Jul 2007 20:28:15 +0000 (14:28 -0600)]
Fix setup.light_twoside determination.
When a vertex program is used, use value of GL_VERTEX_PROGRAM_TWO_SIDE.
Otherwise, if FF lighting, use value of GL_LIGHT_MODEL_TWO_SIDE.
Brian [Fri, 13 Jul 2007 20:25:28 +0000 (14:25 -0600)]
press 'f' to toggle front-face winding
Brian [Fri, 13 Jul 2007 20:22:46 +0000 (14:22 -0600)]
Fix more polygon winding, culling confusion.
If the determinant of the triangle is positive, its winding is CCW (right-handed coord system).
Brian [Fri, 13 Jul 2007 18:28:42 +0000 (12:28 -0600)]
Fix for-loop in interp() so we don't go out of bounds.
Improved comments for that loop.
Added some sanity check assertions regarding vertex layout.
Brian [Fri, 13 Jul 2007 18:26:09 +0000 (12:26 -0600)]
set INTERP_CONSTANT when appropriate
Not really signficant now since draw_flat stage copies the provoking
vertex color to all prim verts.
Brian [Fri, 13 Jul 2007 18:23:34 +0000 (12:23 -0600)]
comments
Brian [Fri, 13 Jul 2007 17:16:13 +0000 (11:16 -0600)]
Enable Keith's branch-less stipple code - it works.
Brian [Fri, 13 Jul 2007 17:15:10 +0000 (11:15 -0600)]
Add 'prim' field to quad so that stipple and aa coverage stages can do the right thing.
Brian [Fri, 13 Jul 2007 16:33:48 +0000 (10:33 -0600)]
Implement AA points and AA coverage application in quad pipeline.
Brian [Fri, 13 Jul 2007 16:32:56 +0000 (10:32 -0600)]
press 's' to toggle smoothing
Brian [Fri, 13 Jul 2007 15:25:57 +0000 (09:25 -0600)]
Added basic occlusion counting
Brian [Fri, 13 Jul 2007 15:23:41 +0000 (09:23 -0600)]
minor rename
Ben Skeggs [Fri, 13 Jul 2007 13:39:24 +0000 (23:39 +1000)]
Play "nuke the typedef"
Keith Whitwell [Fri, 13 Jul 2007 10:28:42 +0000 (11:28 +0100)]
Add conditional-free implementation (disabled, not tested)
Keith Whitwell [Fri, 13 Jul 2007 10:27:57 +0000 (11:27 +0100)]
Simplify slightly.
Don't bother trying to save a small memcpy.
Oliver McFadden [Fri, 13 Jul 2007 09:39:23 +0000 (09:39 +0000)]
Revert "r300: Corrected off-by-one error in r300_vertprog.c."
This reverts commit
07ac2386f5c0ab9c2432d4b5e3490b1e13d033fc.
Oliver McFadden [Fri, 13 Jul 2007 04:58:32 +0000 (04:58 +0000)]
r300: Corrected off-by-one error in r300_vertprog.c.
Oliver McFadden [Fri, 13 Jul 2007 02:11:58 +0000 (02:11 +0000)]
r300: Moved some hardware initialization into appropriate functions.
Oliver McFadden [Fri, 13 Jul 2007 01:45:05 +0000 (01:45 +0000)]
r300: Use a switch statement in r300UpdateCulling.
Oliver McFadden [Thu, 12 Jul 2007 23:52:06 +0000 (23:52 +0000)]
r300: Setup the back facing color bits correctly.
Apparently for back facing color to work you must set all 3 color bits; I guess
the hardware cannot handle them separately.
Brian [Fri, 13 Jul 2007 03:32:35 +0000 (21:32 -0600)]
fix width/depth mix-up (bug 11577)
Brian [Thu, 12 Jul 2007 22:17:14 +0000 (16:17 -0600)]
minor changes, comments about multiple color buffers, MRT.
Brian [Thu, 12 Jul 2007 20:50:53 +0000 (14:50 -0600)]
fix swizzle-related bug 11534
Brian [Thu, 12 Jul 2007 20:13:48 +0000 (14:13 -0600)]
Add a quad 'bufloop' stage to handle glDrawBuffer(GL_FRONT_AND_BACK).
This removes the notion of multiple color buffers from all other stages.
Will need a bit more work when shaders with multiple render targets arrive.
Brian [Thu, 12 Jul 2007 19:44:43 +0000 (13:44 -0600)]
XXX comment about skipping stipple for points/lines
Brian [Thu, 12 Jul 2007 19:43:33 +0000 (13:43 -0600)]
s/prim_setup/sp_draw_render_stage/, new comments
Brian [Thu, 12 Jul 2007 19:33:33 +0000 (13:33 -0600)]
Remove dead code
Brian [Thu, 12 Jul 2007 19:32:31 +0000 (13:32 -0600)]
Rename prim_stage -> draw_stage
Brian [Thu, 12 Jul 2007 18:20:14 +0000 (12:20 -0600)]
Added colormask, dither, multisample state. Implement colormasking stage.
Brian [Thu, 12 Jul 2007 17:59:43 +0000 (11:59 -0600)]
front/back-face determination was wrong
Brian [Thu, 12 Jul 2007 17:59:15 +0000 (11:59 -0600)]
culling was inverted
Brian [Thu, 12 Jul 2007 17:50:52 +0000 (11:50 -0600)]
handle edge flags for GL_POLYGONs
Brian [Thu, 12 Jul 2007 16:43:33 +0000 (10:43 -0600)]
fix MIN/MAX mix-up
Patrice Mandin [Thu, 12 Jul 2007 16:36:41 +0000 (18:36 +0200)]
nv20 also don't support viewport_origin, like nv10
Ben Skeggs [Thu, 12 Jul 2007 01:08:17 +0000 (11:08 +1000)]
nouveau: match drm 0.0.9 interface
Brian [Wed, 11 Jul 2007 22:33:15 +0000 (16:33 -0600)]
clean-up of stencil code
Brian [Wed, 11 Jul 2007 22:19:51 +0000 (16:19 -0600)]
Minor clean-up of polygon offset logic. Properly compute _MRD field.
Brian [Wed, 11 Jul 2007 19:11:47 +0000 (13:11 -0600)]
Improve this demo in a few ways.
1. Use more reasonable hither/yon clip planes to make better use of shallow
(16-bit) z buffers.
2. Use different colors on cube faces to help detect Z fighting if it occurs.
3. Report GL_DEPTH_BITS on start-up.
Brian [Wed, 11 Jul 2007 22:17:23 +0000 (16:17 -0600)]
remove unused hw_data_offset
Brian [Wed, 11 Jul 2007 19:13:00 +0000 (13:13 -0600)]
disable debug printfs
Brian [Wed, 11 Jul 2007 19:12:33 +0000 (13:12 -0600)]
remove glDepthFunc(GL_LEQUAL) change from prev commit
Brian [Wed, 11 Jul 2007 19:02:03 +0000 (13:02 -0600)]
Fix broken depth offset.
The edge vectors were totally wrong.
Need to multiply bias units by the min resolvable depth delta.
Tommy Schultz Lassen [Wed, 11 Jul 2007 17:37:12 +0000 (17:37 +0000)]
r300: Added support for Back Facing Color.
Tommy Schultz Lassen [Wed, 11 Jul 2007 17:35:35 +0000 (17:35 +0000)]
r300: Corrected r300UpdateCulling; would only set font face if culling was set.
Brian [Wed, 11 Jul 2007 17:36:22 +0000 (11:36 -0600)]
Obsolete file.
Brian [Wed, 11 Jul 2007 17:34:19 +0000 (11:34 -0600)]
Implement polygon stipple state tracking, application.
Patrice Mandin [Wed, 11 Jul 2007 17:25:32 +0000 (19:25 +0200)]
nouveau: nv20 does not support hw scissors
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.
Brian [Wed, 11 Jul 2007 15:56:46 +0000 (09:56 -0600)]
need to clamp floats to [0,1] in write functions
Brian [Wed, 11 Jul 2007 15:52:32 +0000 (09:52 -0600)]
fix stencil logic error, use proper front/back face value
Brian [Wed, 11 Jul 2007 15:52:00 +0000 (09:52 -0600)]
Compute quad.facing from prim->det and polygon winding.
Updated comments/questions about area vs. prim->det.
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.)
Brian [Wed, 11 Jul 2007 00:59:17 +0000 (18:59 -0600)]
Checkpoint: stencil roughly working, some bugs to fix...
Arthur Huillet [Wed, 11 Jul 2007 00:48:40 +0000 (02:48 +0200)]
bumped nouveau DRM interface version number
Brian [Tue, 10 Jul 2007 22:37:18 +0000 (16:37 -0600)]
Begin hooking up stenciling.
Brian [Tue, 10 Jul 2007 22:37:03 +0000 (16:37 -0600)]
clean-ups
Brian [Tue, 10 Jul 2007 22:25:43 +0000 (16:25 -0600)]
Fill in remaining switch cases. Only call next stage if quad->mask != 0.
Brian [Tue, 10 Jul 2007 21:29:17 +0000 (15:29 -0600)]
remove debug printf
Brian [Tue, 10 Jul 2007 21:24:31 +0000 (15:24 -0600)]
Fix line clipping bug. New comments.
Need to use a new prim_header for the post-clipped line. Otherwise,
we were changing the header passed to us from the vb code. That messed
up the vertex pointers for the next line primitive.
Brian [Tue, 10 Jul 2007 20:46:15 +0000 (14:46 -0600)]
clean-up, comments
Brian [Tue, 10 Jul 2007 20:38:10 +0000 (14:38 -0600)]
clamp after offsetting, new comments
Brian [Tue, 10 Jul 2007 20:36:10 +0000 (14:36 -0600)]
remove unneeded casts, added comments
Brian [Tue, 10 Jul 2007 19:53:21 +0000 (13:53 -0600)]
Do depth testing with integer values.
Using floats (and float->ushort->float conversion) introduces errors.
Only GLushort depth buffers work for now...