mesa: Changes to 'softpipe_0_1_branch'
Keith Whitwell
keithw at kemper.freedesktop.org
Tue Jul 17 03:25:15 PDT 2007
progs/demos/geartrain.c | 1
progs/demos/gltestperf.c | 1
progs/demos/isosurf.c | 1
progs/demos/morph3d.c | 9
progs/demos/winpos.c | 1
progs/xdemos/offset.c | 34
src/mesa/drivers/dri/common/dri_util.c | 2
src/mesa/drivers/dri/i915/i915_vtbl.c | 1
src/mesa/drivers/dri/i915/intel_pixel.c | 6
src/mesa/drivers/dri/i915tex/i915_vtbl.c | 3
src/mesa/drivers/dri/i915tex/intel_blit.c | 43
src/mesa/drivers/dri/i915tex/intel_buffers.c | 104 -
src/mesa/drivers/dri/i915tex/intel_context.c | 92 -
src/mesa/drivers/dri/i915tex/intel_context.h | 4
src/mesa/drivers/dri/i915tex/intel_fbo.c | 29
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c | 6
src/mesa/drivers/dri/i915tex/intel_screen.c | 65
src/mesa/drivers/dri/i915tex/intel_screen.h | 1
src/mesa/drivers/dri/i915tex/intel_state.c | 24
src/mesa/drivers/dri/nouveau/nouveau_buffers.c | 19
src/mesa/drivers/dri/nouveau/nouveau_context.c | 4
src/mesa/drivers/dri/nouveau/nouveau_context.h | 6
src/mesa/drivers/dri/nouveau/nouveau_driver.c | 4
src/mesa/drivers/dri/nouveau/nouveau_fifo.c | 2
src/mesa/drivers/dri/nouveau/nouveau_lock.c | 2
src/mesa/drivers/dri/nouveau/nouveau_object.c | 7
src/mesa/drivers/dri/nouveau/nouveau_screen.c | 2
src/mesa/drivers/dri/nouveau/nouveau_state.c | 2
src/mesa/drivers/dri/nouveau/nouveau_sync.c | 23
src/mesa/drivers/dri/nouveau/nouveau_sync.h | 16
src/mesa/drivers/dri/nouveau/nv10_state.c | 7
src/mesa/drivers/dri/nouveau/nv10_swtcl.c | 8
src/mesa/drivers/dri/nouveau/nv20_state.c | 8
src/mesa/drivers/dri/r300/r300_context.h | 11
src/mesa/drivers/dri/r300/r300_emit.c | 13
src/mesa/drivers/dri/r300/r300_reg.h | 23
src/mesa/drivers/dri/r300/r300_state.c | 91 -
src/mesa/drivers/dri/r300/r300_vertprog.c | 1637 +++++++++++++-----------
src/mesa/drivers/dri/r300/r300_vertprog.h | 6
src/mesa/main/api_validate.c | 19
src/mesa/main/context.c | 11
src/mesa/main/framebuffer.c | 4
src/mesa/main/image.c | 30
src/mesa/main/image.h | 6
src/mesa/main/teximage.c | 32
src/mesa/main/texstore.c | 8
src/mesa/shader/shader_api.c | 6
src/mesa/shader/slang/slang_codegen.c | 5
src/mesa/swrast/s_drawpix.c | 6
src/mesa/swrast/s_stencil.c | 85 -
src/mesa/swrast_setup/ss_context.c | 25
src/mesa/swrast_setup/ss_tritmp.h | 40
52 files changed, 1500 insertions(+), 1095 deletions(-)
commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary
New commits:
commit 6101fe641cd506422d0b2735dfcaa61174684ec4
Merge: bb1b016... 7b410f3...
Author: Keith Whitwell <keith at tungstengraphics.com>
Date: Tue Jul 17 11:06:31 2007 +0100
Merge branch 'origin' into softpipe_0_1_branch
commit bb1b01616b6cb9b0a1cab74e10940ce346cb8a3d
Merge: 2bf4a50... 20cf13e...
Author: Keith Whitwell <keith at tungstengraphics.com>
Date: Tue Jul 17 11:06:02 2007 +0100
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
commit 7b410f366fa117a03a7e838562215d2dca3f8cbc
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 21:43:39 2007 +0000
r300: Corrected some progs/fp/* regressions from the BFC patch.
I'm not completely sure this is correct; it restores the old behaviour.
commit 8a016d213029ff4714a79e03a3b4922d70f54e80
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 20:24:41 2007 +0000
r300: Use _mesa_num_inst_src_regs for number of arguments.
commit f66775184b0be00cd0ac1163d2e9d4d656746af2
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 20:07:30 2007 +0000
r300: Corrected vertprog FLR and XPD instruction regression.
commit 3eba764df8b2b61588244e1e5457926062df065d
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 19:20:32 2007 +0000
r300: Added code for vertprog opcode ARL.
commit 611674ed692c219baeb6005373fe0fbf3c111ab4
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 19:13:46 2007 +0000
r300: Don't need vertprog scalar flag anymore; it's handled explicitly...
commit b89a5c6e064d42e54c8748a35069b46460e4a6a9
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 19:10:13 2007 +0000
r300: Removed broken RCC vertprog opcode.
commit 15f1609922d727f722a6d319c7df579b3ef77ed2
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 19:09:29 2007 +0000
r300: More vertprog rework; give each opcode it's own function.
commit 39766010cd35b1c58ce8f03b3679b20398eacb1b
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 16:21:21 2007 +0000
Revert "r300: Gracefully exit after GART memory is exhausted."
This reverts commit 9457bf62bbba3b9226ebbbea5dc7798ca22485f6.
Causes the X server to die with Compiz and Beryl.
commit cc85860ccb44ac0a5a08217b9c9ba3fcef3b3a52
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 16:17:50 2007 +0000
r300: Reorder the vertprog code to the ARB specification.
commit cbfe29cdee5d338a25f13abbbb191b80428d05c8
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Mon Jul 16 18:21:36 2007 +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.)
commit fb3b9060d48934ca4faa72e966c00aee627ce96d
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Mon Jul 16 18:09:30 2007 +0200
fix segfault with i915 drivers in swrast drawpixels path when resizing windows
commit d895c5a08f18c8b550631f7c735c2dafaf8ec785
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 15:42:16 2007 +0000
r300: Use the R300_PVS_UPLOAD_* defines.
commit 4013382ea2ab08b7904ad908f7b66d2a737b59da
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 15:39:12 2007 +0000
r300: Added the clip plane upload defines.
commit 81c333adbcb5c853d2f9e864f701080279977ac6
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 12:21:38 2007 +0000
r300: Enable the vertprog point size again.
commit 03105d7b3edb5ab7c77925fdfce832882a7191ab
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 11:34:40 2007 +0000
r300: Corrected position bug with position invariant option. Bug #11594.
commit aa9d77ca3c89c2b8119149ff3d49eec226dc80d1
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 07:17:22 2007 +0000
r300: Removed Vim modeline I left in the file by mistake. :-)
commit 72581241a85081d6103158c484c18d356935b46c
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 07:12:29 2007 +0000
r300: Make sure the modified value of u_temp_i is respected.
commit 87855fb32cf7df0162720fc71976d3d23c0dbba6
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 06:38:12 2007 +0000
r300: Added a function for vertex program default opcode translation.
commit ddb74cb443913a159ec800891710f18d4700d398
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 06:33:53 2007 +0000
r300: Clean up the vertex program maximum length check.
commit d0b3f3ce817700286e059bb24caa12b09e7ec954
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 06:27:29 2007 +0000
r300: Corrected indenting in r300_vertprog.c.
commit 79773ba13ac75fcdf12f187eead41ff35d75d6c0
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 06:16:35 2007 +0000
r300: Major vertex program code clean up and rework.
commit b0f0b4044cae50af3443e1bfeb87b2d7d6042913
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Mon Jul 16 05:04:10 2007 +0000
r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.
commit 9457bf62bbba3b9226ebbbea5dc7798ca22485f6
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Sun Jul 15 01:17:54 2007 +0000
r300: Gracefully exit after GART memory is exhausted.
commit 393558a933670705f9d3482fd976393a2baca957
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Sat Jul 14 18:31:29 2007 +0000
r300: Disable vertex program point size; it's almost certainly wrong.
See the conversation between myself and Tommy Schultz Lassen on mesa3d-dev.
commit 491f646c798ec2f20ba5a6adc600bc7ea92ddf24
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Sat Jul 14 18:11:45 2007 +0000
r300: Clean up the vertex program output assignment.
commit 24f85f047b8b9e9b465bd3f9af2cc113582bfc0d
Author: Patrice Mandin <pmandin at caramail.com>
Date: Sat Jul 14 18:54:22 2007 +0200
nouveau: nv10 and nv11,15 are different
commit 5a0f02a394cec0603fe48de55f4cbe323d2357e0
Author: Jan Dvorak <jan.dvorak at kraxnet.cz>
Date: Fri Jul 13 16:36:00 2007 -0600
fix shader/info string length queries (bug 11588)
commit 8fcfaa3238599f5a9b28794b748b8417e042c597
Author: Ben Skeggs <skeggsb at gmail.com>
Date: Fri Jul 13 23:39:24 2007 +1000
Play "nuke the typedef"
commit 5ec66cf62dab00a50499bc8d2a666146a334a3cb
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Fri Jul 13 09:39:23 2007 +0000
Revert "r300: Corrected off-by-one error in r300_vertprog.c."
This reverts commit 07ac2386f5c0ab9c2432d4b5e3490b1e13d033fc.
commit 07ac2386f5c0ab9c2432d4b5e3490b1e13d033fc
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Fri Jul 13 04:58:32 2007 +0000
r300: Corrected off-by-one error in r300_vertprog.c.
commit 42dcdb9372f541f35c06920368946ebe24696fc4
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Fri Jul 13 02:11:58 2007 +0000
r300: Moved some hardware initialization into appropriate functions.
commit 08a005e076d4520f564881e4c7e54b47cc7e20c3
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Fri Jul 13 01:45:05 2007 +0000
r300: Use a switch statement in r300UpdateCulling.
commit 4b08b9c3e9da922d80aaff4720ed2dec026c012e
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date: Thu Jul 12 23:52:06 2007 +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.
commit 7c4c82fc6d5301e27643868517aeb23fcb5c40e6
Author: Brian <brian.paul at tungstengraphics.com>
Date: Thu Jul 12 21:32:35 2007 -0600
fix width/depth mix-up (bug 11577)
commit f5eb25e9c7b09612766255f2e2059f3df2bf2095
Author: Brian <brian.paul at tungstengraphics.com>
Date: Thu Jul 12 14:50:53 2007 -0600
fix swizzle-related bug 11534
commit e5dd38942989475f7fd8936a98738bbd57de6b50
Author: Patrice Mandin <pmandin at caramail.com>
Date: Thu Jul 12 18:36:41 2007 +0200
nv20 also don't support viewport_origin, like nv10
commit cd8613e59d2d27b5f41d23d978afe8e33d206447
Author: Ben Skeggs <skeggsb at gmail.com>
Date: Thu Jul 12 11:08:17 2007 +1000
nouveau: match drm 0.0.9 interface
commit 3ffa09b09dfd55c64cb98bd8e7bab0370f93cdbd
Author: Brian <brian.paul at tungstengraphics.com>
Date: Wed Jul 11 16:33:15 2007 -0600
clean-up of stencil code
commit b755a2d9de5b7977c410a904a8adb7c07c88f82a
Author: Brian <brian.paul at tungstengraphics.com>
Date: Wed Jul 11 16:19:51 2007 -0600
Minor clean-up of polygon offset logic. Properly compute _MRD field.
commit 34f6243beff6a66a76814638db68897eb719dd30
Author: Brian <brian.paul at tungstengraphics.com>
Date: Wed Jul 11 13:11:47 2007 -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.
commit ee7fece05462e3cc00b4f24069748c1401fcacef
Author: Tommy Schultz Lassen <mesa3d at krynn.dk>
Date: Wed Jul 11 17:37:12 2007 +0000
r300: Added support for Back Facing Color.
commit 4bd04c9851097ff4dfbfd73f6c62e1bc4143fc0d
Author: Tommy Schultz Lassen <mesa3d at krynn.dk>
Date: Wed Jul 11 17:35:35 2007 +0000
r300: Corrected r300UpdateCulling; would only set font face if culling was set.
commit 922dadf422440e120c7123a728454e517289e430
Author: Patrice Mandin <pmandin at caramail.com>
Date: Wed Jul 11 19:25:32 2007 +0200
nouveau: nv20 does not support hw scissors
commit 20cf13e03b1703937b4228aba8355b34d664aafb
Author: Keith Whitwell <keith at tungstengraphics.com>
Date: Wed Jul 11 17:01:30 2007 +0100
Fix screen corruption on resize.
Move buffer resize check to immediately after swapbuffers.
Update cliprects inside the locked region of swapbuffers.
commit fb67b1609e211ed16828e10ffc1c36e54f655112
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Wed Jul 11 17:30:01 2007 +0200
remove bogus assertion, change drawable updates
don't update driDrawable information until later at all
(blit needs fixing).
commit eb2a896f68e5402764955a30b949d8408d435e73
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Wed Jul 11 16:08:14 2007 +0200
drop some more code no longer needed
commit 43e24ff50773575d28763d899a4f25bb430418b5
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Wed Jul 11 14:20:39 2007 +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.)
commit a8ec5dac3c8c564b1c405798f7703e0d8e650f2d
Author: Arthur Huillet <arthur.huillet at free.fr>
Date: Wed Jul 11 02:48:40 2007 +0200
bumped nouveau DRM interface version number
commit 1278514ff48b262ee0a4f2ac698c6df648b326a0
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Tue Jul 10 19:56:44 2007 +0200
copybuffer/cliprect fixups
commit d348a48ac353d7c646a0c4f976f23a764990e779
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Tue Jul 10 18:07:38 2007 +0200
First attempt at using private back/z buffers.
Allocate and use private back and z/stencil buffers.
This is still very broken.
commit 7c42222111d3697ea8d76e3d94d7455c69c7f2d1
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Tue Jul 10 11:02:18 2007 +0200
i915tex: Better procedure for dropping batchbuffer on virtual resolution change.
The previous procedure would often result in a GPU lockup.
commit f1e1b2ed167b63409a88ba489418e407fce68f21
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Tue Jul 10 10:54:51 2007 +0200
i915tex: Only wait for vblank when really necessary.
This avoids superfluous waits for vblank timing out under some circumstances.
commit a903749b246fce26038c66d06fe7eb77daf815ab
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Tue Jul 10 10:49:28 2007 +0200
Clear pointers to freed cliprects.
Not doing this could lead to double frees under rare circumstances.
commit aa328291c5b015e74ebfd9c5cdb39227265b3000
Author: Brian <brian.paul at tungstengraphics.com>
Date: Sun Jul 8 09:58:18 2007 -0600
Fix size test bug in _mesa_test_proxy_teximage().
width/height/depth == 0 is a legal texture size (no error generated).
Later, the texture will be considered incomplete, however, and texturing
will effectively be disabled.
See bug 11309.
commit 37ece4df7c654b30b6720044b35a83694d7e5bb3
Author: Brian <brian.paul at tungstengraphics.com>
Date: Sun Jul 8 09:20:42 2007 -0600
Check if 'indices' parameter is NULL (bug 11314)
commit 25cfb68f0b3baf0e74d1f6a37afab46370f6711b
Author: Brian <brian.paul at tungstengraphics.com>
Date: Sun Jul 8 09:02:36 2007 -0600
Change float depthScale param to _mesa_unpack_depth_span() to GLuint depthMax.
commit 64359af07188c06dcc6a9a95ba05f7e8209a7379
Author: Brian <brian.paul at tungstengraphics.com>
Date: Sun Jul 8 08:53:19 2007 -0600
check depthScale value for optimized ushort->uint case (fixes bug 11474)
commit a164d3aee063580503e5e9a77980059d52c486d7
Author: Brian <brian.paul at tungstengraphics.com>
Date: Fri Jul 6 16:51:19 2007 -0600
In _swsetup_Translate(), update dest->attrib[FRAG_ATTRIB_COL0].
Also, check if we're in RGB vs. CI mode. This fixes a problem with
incorrect rendering color seen with the redbook/polys demo.
commit 0bf2479aef5def4d01bfc55b08992f41664f1431
Author: Brian <brian.paul at tungstengraphics.com>
Date: Fri Jul 6 16:50:13 2007 -0600
Add case for GL_QUADS in i915_reduced_primitive_state().
The t_dd_tritemp.h code can emit GL_QUADS primitives. We need to catch
that case to determine if polygon stipple should be enabled.
Fixes bug reported by Carlos Diógenes on 4 July 2007.
commit f0aa6654e27b279ecb29e9fd19c140cb1ac7946f
Merge: 69501d7... f98bdfc...
Author: Patrice Mandin <pmandin at caramail.com>
Date: Sat Jul 7 00:08:35 2007 +0200
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
commit 69501d76fc6a45da48bf4c416ac9e15edd44e7a9
Author: Patrice Mandin <pmandin at caramail.com>
Date: Fri Jul 6 23:59:29 2007 +0200
NV_17 is different from NV_10
commit 2adcd5bdd2ac4931bbbfd16140800330d3fd14f8
Author: Patrice Mandin <pmandin at caramail.com>
Date: Fri Jul 6 23:55:51 2007 +0200
NV1X don't support VIEWPORT_ORIGIN in hardware
commit f98bdfca574478837b33c97d131dad4833e3ee12
Author: Xavier Bachelot <xavier at bachelot.org>
Date: Fri Jul 6 12:56:21 2007 -0600
call glutInit(), bug 11486
More information about the mesa-commit
mailing list