mesa: Changes to '965-ttm'

Eric Anholt anholt at kemper.freedesktop.org
Sat Dec 8 00:23:32 UTC 2007


 bin/mklib                                        |    9 
 configs/default                                  |    2 
 configs/linux-osmesa                             |    2 
 configs/linux-osmesa16                           |    2 
 configs/linux-osmesa16-static                    |    2 
 configs/linux-osmesa32                           |    2 
 configs/linux-static                             |    3 
 configs/linux-x86-64-static                      |    3 
 configs/linux-x86-static                         |    3 
 progs/demos/descrip.mms                          |   52 -
 progs/glsl/CH11-toyball.frag.txt                 |    7 
 progs/glsl/CH11-toyball.vert.txt                 |    7 
 progs/osdemos/Makefile                           |   14 
 progs/tests/fbotexture.c                         |   70 +-
 progs/trivial/quad-clip-nearplane.c              |   43 -
 src/glw/glw.pc.in                                |    2 
 src/glx/x11/dri_glx.c                            |   11 
 src/glx/x11/glxclient.h                          |    1 
 src/glx/x11/glxcmds.c                            |    1 
 src/mesa/Makefile                                |    2 
 src/mesa/descrip.mms                             |    5 
 src/mesa/drivers/common/descrip.mms              |    5 
 src/mesa/drivers/common/driverfuncs.c            |    2 
 src/mesa/drivers/dri/common/dri_bufmgr.c         |    9 
 src/mesa/drivers/dri/common/dri_bufmgr.h         |   14 
 src/mesa/drivers/dri/common/dri_bufmgr_fake.c    |   43 -
 src/mesa/drivers/dri/common/dri_util.c           |    3 
 src/mesa/drivers/dri/i915/i830_vtbl.c            |   62 +
 src/mesa/drivers/dri/i915/i915_vtbl.c            |   14 
 src/mesa/drivers/dri/i915/intel_context.c        |    2 
 src/mesa/drivers/dri/i965/brw_context.c          |    2 
 src/mesa/drivers/dri/i965/brw_curbe.c            |   62 -
 src/mesa/drivers/dri/i965/brw_misc_state.c       |    4 
 src/mesa/drivers/dri/i965/brw_state_pool.c       |    1 
 src/mesa/drivers/dri/i965/brw_tex.c              |    2 
 src/mesa/drivers/dri/i965/brw_wm_emit.c          |    1 
 src/mesa/drivers/dri/i965/brw_wm_glsl.c          |   14 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   10 
 src/mesa/drivers/dri/i965/intel_blit.c           |   22 
 src/mesa/drivers/dri/i965/intel_buffer_objects.c |    6 
 src/mesa/drivers/dri/i965/intel_buffers.c        |   32 -
 src/mesa/drivers/dri/i965/intel_context.c        |   19 
 src/mesa/drivers/dri/i965/intel_context.h        |    6 
 src/mesa/drivers/dri/i965/intel_pixel_copy.c     |    9 
 src/mesa/drivers/dri/i965/intel_span.c           |   12 
 src/mesa/drivers/dri/i965/intel_tex_layout.c     |  128 ----
 src/mesa/drivers/dri/intel/intel_batchbuffer.c   |    1 
 src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c    |  726 ++++++++++++-----------
 src/mesa/drivers/dri/r200/r200_texstate.c        |    9 
 src/mesa/drivers/osmesa/descrip.mms              |   10 
 src/mesa/drivers/windows/gdi/wgl.c               |   20 
 src/mesa/drivers/x11/descrip.mms                 |   10 
 src/mesa/main/config.h                           |    2 
 src/mesa/main/context.c                          |    1 
 src/mesa/main/dd.h                               |    5 
 src/mesa/main/descrip.mms                        |   25 
 src/mesa/main/enable.c                           |    8 
 src/mesa/main/mtypes.h                           |    6 
 src/mesa/main/texstore.c                         |   24 
 src/mesa/math/descrip.mms                        |    6 
 src/mesa/shader/descrip.mms                      |   40 -
 src/mesa/shader/prog_statevars.c                 |   93 ++
 src/mesa/shader/prog_statevars.h                 |    8 
 src/mesa/shader/slang/descrip.mms                |   49 -
 src/mesa/shader/slang/slang_codegen.c            |    3 
 src/mesa/swrast/descrip.mms                      |   18 
 src/mesa/swrast/s_aalinetemp.h                   |    1 
 src/mesa/swrast/s_aatritemp.h                    |    5 
 src/mesa/swrast/s_context.c                      |   17 
 src/mesa/swrast/s_context.h                      |    4 
 src/mesa/swrast/s_fragprog.c                     |    2 
 src/mesa/swrast/s_linetemp.h                     |    3 
 src/mesa/swrast/s_points.c                       |   10 
 src/mesa/swrast/s_triangle.c                     |    2 
 src/mesa/swrast/s_tritemp.h                      |   12 
 src/mesa/swrast/swrast.h                         |    7 
 src/mesa/swrast_setup/descrip.mms                |    7 
 src/mesa/swrast_setup/ss_context.c               |    3 
 src/mesa/swrast_setup/ss_triangle.c              |   10 
 src/mesa/swrast_setup/ss_tritmp.h                |    2 
 src/mesa/tnl/descrip.mms                         |   38 -
 src/mesa/tnl/t_vb_program.c                      |  159 +----
 src/mesa/tnl/tnl.h                               |    8 
 src/mesa/tnl_dd/t_dd_tritmp.h                    |    8 
 src/mesa/vbo/descrip.mms                         |    4 
 85 files changed, 1164 insertions(+), 929 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 8e089ba58bddead76bbe6b374ffeb6e77ba9571c
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 16:05:40 2007 -0800

    [965] Add a performance note about intel_bufferobj_data implementation.

commit 1885651976f8fbf93848ea829d5cbab98449b8f1
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 15:52:41 2007 -0800

    [965] Remove bogus comment from before I understood our state pools.

commit ede7ebdc2935163b1fc15f3a656cc1081336a34c
Merge: e369d1778012a7129cad4cfe83838208bbbc6d2c 3ecdae82d751f9f404d10332f030e3280949ce4e
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 15:46:51 2007 -0800

    Merge remote branch 'origin/master' into 965-ttm
    
    Conflicts:
    
    	src/mesa/drivers/dri/i965/brw_wm_surface_state.c

commit 3ecdae82d751f9f404d10332f030e3280949ce4e
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 15:20:00 2007 -0800

    [965] Remove dead code in upload_wm_surfaces.

commit e34a183d870e393187b2c26e37ea1e900c2ab1f7
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 15:16:42 2007 -0800

    [965] Move brw_surface_state stack allocation into the function using it.

commit e369d1778012a7129cad4cfe83838208bbbc6d2c
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 15:00:18 2007 -0800

    [965] Move screen regions back to intel_context.h.
    
    This reduces the diff to master, and it looks like the bufmgr will likely
    be moving to the context soon anyway for performance reasons, so no
    need to make this change all over.

commit f1efacb92b4c7e52f5f060a655a2dacfdddac44b
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Wed Dec 5 20:34:59 2007 -0800

    Make osdemos linking like other programs
    
    Most of the programs list their dependencies on the Mesa libraries in
    their Makefiles. This works with the default configuration where
    APP_LIB_DEPS only lists external libraries. This changes the
    linux-osmesa configs and the osdemos Makefile to follow that convention.
    
    Some cleanup of the Makefile is also added to refer to the GL libraries
    through the existing variables rather than hardcoding their names.

commit 5ef37d90e898858c137ee77403bc613777e46b62
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 13:29:42 2007 -0800

    [965] Fix a file that was added instead of linked during a merge conflict.

commit 4a3bbf60b0e6574cfef40966d8b86cf85d2e07c0
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 11:59:06 2007 -0800

    [intel] Fix up a doxygen comment for removed parameter.

commit 4d041ab34bf57f39874436f0f4b866aac7111a97
Merge: 230dec40b9fb79c4b6d41d1941eeebf7120d120b e2ca788ae700aae75bf8d024c1374c38cc5574f9
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 7 11:54:27 2007 -0800

    Merge remote branch 'origin/master' into 965-ttm
    
    Conflicts:
    
    	src/mesa/drivers/dri/common/dri_bufmgr.h

commit 6aaf9bdd418e11d5ccb76a6ab85a8df36b0c8804
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Wed Oct 31 17:12:07 2007 -0700

    configs: Fix linking with static libGL and --as-needed
    
    Linking of the programs breaks when using a static libGL and the GNU ld
    option --as-needed. This is because libXext is needed for the XShm
    functions.

commit e2ca788ae700aae75bf8d024c1374c38cc5574f9
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Dec 7 17:33:18 2007 +0800

    i915: fix the error in the previos commit.

commit c1a3ac0e45d6b69d5567f80b76815b2e6997128d
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Dec 7 17:26:38 2007 +0800

    i915: Check the program size when uploading a program. fix bug 13494

commit 62f6e550138ebccbdeb8dd044eabf757d5482126
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Dec 6 10:19:22 2007 +0100

    Minor followup fixes for the previous commit.

commit 17afc800c9b69997ae7ba52b67c021f68066e008
Author: George Nassas <gnassas at gmail.com>
Date:   Thu Dec 6 10:11:05 2007 +0100

    Always call dlopen in DriverOpen.
    
    This increases the reference count for the driver binary, preventing it from
    getting unloaded prematurely in driDestroyDisplay. See
    https://bugs.freedesktop.org/show_bug.cgi?id=13541 .

commit 125bd4cae51c6deaacd2e90f14931c2052f146ab
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 5 16:57:27 2007 -0800

    Revert "[965] Add missing flagging of new stage programs for updating stage state."
    
    I had forgotten part of brw_state_cache.c that made this fix not relevant for
    master (last_addr comparison and flagging based on cache id).
    
    This reverts commit a4642f3d18bdaebaba31e5dee72fe5de9d890ffb.

commit a4642f3d18bdaebaba31e5dee72fe5de9d890ffb
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Dec 5 15:52:13 2007 -0800

    [965] Add missing flagging of new stage programs for updating stage state.
    
    Otherwise, choosing a new program wouldn't necessarily update the state, and
    and an old program could be executed, leading to various sorts of pretty
    pictures or hangs.

commit 259eacfa94a1086e4c99db83516989cc27832ef4
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Wed Dec 5 15:06:23 2007 -0700

    Fix endianness bug in _mesa_texstore_argb8888()
    
    On big-endian, storing in _mesa_texformat_argb8888 format produced wrong res
    Also, clean-up nearby code to match.
    
    picked from gallium-0.1 branch

commit 2407e48f2805e27e76e2e1d7083926c4077d9032
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Dec 5 10:31:35 2007 +0800

    Don't Swap buffer if a DRIDrawable is entirely obscured
    by another window.

commit 5b91ee27c0f6e6379a9dc0bb41f4aef2f66b6346
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 18:44:40 2007 -0700

    Undo changes made to the toyball shaders in commit d19d0596daf004b56d80f78fa1a329b43c2ebf94
    
    This demo produces the expected results again.

commit 02afd45d3b2eccff5d566cdeb32b3211803bd500
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 14:06:10 2007 -0700

    fix span->facing computation and gl_FrontFacing initialization

commit 2ee7035886d9f857677776f84e55f92153318832
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 14:05:26 2007 -0700

    Fix gl_FrontFacing compilation problem

commit df198d24bcb48c7f51ba9d814d97496d998b5db9
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 10:48:05 2007 -0700

    added culling/wireframe options

commit fc7ddea8535f1a9c196bf30f7864414e4ac18b8a
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Dec 4 10:46:45 2007 +0100

    Use -Bsymbolic for linking all shared objects.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 .
    
    Also remove comment about SONAME, as SONAME only applies to shared libraries.

commit 3a90679400e50fb5d319deee51e03a298735aa17
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 3 10:58:08 2007 -0800

    [965] Change constant buffer from state structs to plain batch emission.
    
    Reduces diff to branch which has a relocation in this state emit.

commit 454043c4ae20a92ff0a56f41fdb6aa7a75af00c8
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Dec 3 14:14:16 2007 -0700

    fix DD_TRI_LIGHT_TWOSIDE bug (#13368)

commit 2dc85e8078bed67cb5d8bc3e16484f56c61c61ca
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Dec 3 11:57:14 2007 -0800

    Fix the library name in glw.pc
    
    Fix a copy and paste error s/GLU/GLw/ in glw.pc.

commit ce98779571eee3f51d9f571fecf8deb83dd60f78
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Dec 3 11:58:55 2007 -0700

    glut doesn't need -lXt

commit b1416c2137d6f7973e65f07ca9859970bead25b6
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Dec 3 11:57:56 2007 -0700

    added missing quote char

commit 2af613e0b8e6f89cc7528ff5a969e18f077e61fc
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Nov 30 11:40:06 2007 +0100

    i915: Fix up state changes for i8xx.

commit 556cf9abff75eaa56c3ea11f1c59cb04d30c0b92
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 30 18:17:12 2007 -0800

    [intel] Move batch bo_unmap from TTM code to shared, and add more asserts.

commit d388cad74675b6ac9bde4aa1dbdd3f4b0138942d
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 30 18:12:23 2007 -0800

    [intel] Add failure path printfs to relocation code and some comments.

commit 700468b8bc37a26bb5a229ab8fa0478aaa7a049e
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 30 18:08:17 2007 -0800

    [intel] Simplify TTM relocation code by passing around bufmgr struct.

commit ddd92ee9a173bbb087ef67b4a36ac231e30c941f
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 30 14:15:36 2007 -0800

    [intel] Fix the type and naming of the flags/mask args to TTM functions.
    
    The uint64_t flags (as defined by drm.h) were being used as unsigned ints in
    many places.

commit 6f8dee03aaeab67532bbadef27f9e2a91e0022d8
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Nov 30 14:14:11 2007 -0800

    [intel] intel_bufmgr_ttm style sanity

commit b0b882b666da0673b5f2aa7676e54438538c6a7f
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Nov 30 15:52:27 2007 -0700

    fix-build: remove ctx->_Facing assignment

commit fcd7c37fd3d0f61cf6ac81170bc0b3fca64ad9bb
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Nov 30 13:01:57 2007 -0700

    fix broken two-sided stencil

commit 44c8dac0af8ae679b25b458980ce97d8ff410766
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Nov 30 09:07:39 2007 -0700

    better front-plane clip test

commit a11b6f025cd31d63c061129fd7272a928184f808
Author: joukj <joukj at tarantella.(none)>
Date:   Fri Nov 30 13:16:05 2007 +0100

    Updates of some OpenVMS makefiles.

commit 86f3135fbd9db9ca08a6c0bfc620345c8a8e3f04
Merge: d1414da8f9dbf3c27cf05509be51e8c70ed1185d d2540e6d4bdcfcda195f6dcf43f75b810001c227
Author: joukj <joukj at tarantella.(none)>
Date:   Fri Nov 30 11:12:41 2007 +0100

    Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa

commit d2540e6d4bdcfcda195f6dcf43f75b810001c227
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Nov 30 12:04:04 2007 +0800

    i965: if source depth to render target is set,
    it should be handled in fb_write.

commit 6bc1d3856712f5298d9ecd55807025ebd5344660
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Nov 30 11:50:08 2007 +0800

    i965: use uncompressed instruction to ensure only
    Pixel Mask Copy is modified as the pixel shader thread
    turns off pixels based on kill instructions.

commit 1df7a82688c4f41b06ef04d997654afb4e05071b
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 29 13:00:34 2007 -0800

    [i915] Make INTEL_DEBUG=bufmgr actually do things for bufmgr_fake.

commit 61fbc816570820757afdbc3cd04cd475b337ad4f
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Nov 29 08:12:33 2007 -0700

    New ctx->Driver.Map/UnmapTexture() functions for accessing textures from t_vb_program.c

commit a2ab143b751b85ecb6b9807982ef6dab254f4b93
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Wed Nov 28 15:55:57 2007 -0700

    cleanups, comments

commit a7e1b4456a08d84c976bd260d018ca88f35867e4
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Wed Nov 28 15:19:46 2007 -0700

    Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c

commit dc88a96631c21c2bc2cdffefc8947e8924d77c91
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Nov 28 10:20:04 2007 +0100

    r200: Fix texture format regression on big endian systems.
    
    See https://bugs.freedesktop.org/show_bug.cgi?id=13324 .
    
    Also use tx_table_be for VALID_FORMAT, in case r200SetTexImages ever gets
    called for MESA_FORMAT_RGB888.

commit d8fcb504a4d88dc1c4d63fb572fdb7393b8a33aa
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Nov 28 09:46:43 2007 +0800

    i965: update RefCount when using Vertex/Fragment program.
    It makes quake4-demo works well on 965.

commit 16099c15f5495f22252c6bed655f7f598ebf8001
Author: WuNian <nian.wu at intel.com>
Date:   Tue Nov 27 18:22:42 2007 -0700

    remove drawable from hash table when window is deleted (see bug 13091)

commit 5c64e6885dd3810a8ac5a49a55f807c5994c30fb
Author: Delle <delle at ciaoweb.it>
Date:   Tue Nov 27 18:18:25 2007 -0700

    use DEFAULT_SOFTWARE_DEPTH_BITS

commit d1414da8f9dbf3c27cf05509be51e8c70ed1185d
Merge: b263435a98173645fa3f4a5dce4566e53470f38f d2f19a554a9089fddb5e978e3a732bbf71d77f93
Author: Jouk <joukj at tarantella.nano.tudelft.nl>
Date:   Wed Oct 31 08:18:58 2007 +0100

    Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa

commit b263435a98173645fa3f4a5dce4566e53470f38f
Author: Jouk <joukj at tarantella.nano.tudelft.nl>
Date:   Wed Oct 3 15:21:40 2007 +0200

     Update of OpenVMS makefiles for the use of "new" include file convention

commit 584b84256b07e106cd7295495355eb21226465d7
Merge: eb9a5b6d5127858b01ec12672c999e7d25cd7aed de1d725f442caa4d8ecbac3256b5a33d1f4a1257
Author: Jouk <joukj at tarantella.nano.tudelft.nl>
Date:   Tue Oct 2 15:17:23 2007 +0200

    Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa

commit eb9a5b6d5127858b01ec12672c999e7d25cd7aed
Merge: 55f8b7053065ce88296608071feed6f9540f6c0d 03ec41ddc51e539c989a546f33d22daa2af69095
Author: Jouk <joukj at tarantella.(none)>
Date:   Wed Jul 25 10:16:11 2007 +0200

    Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa

commit 55f8b7053065ce88296608071feed6f9540f6c0d
Merge: 518f9168862b2096278ae14a65c8c854c208e004 7b559a91028d297b34df9ec939bd4d00fad6027c
Author: Jouk <joukj at tarantella.(none)>
Date:   Fri Jun 8 13:38:24 2007 +0200

    Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa

commit 518f9168862b2096278ae14a65c8c854c208e004
Author: J.Jansen <joukj at tarantella.nano.tudelft.nl>
Date:   Thu May 10 08:04:39 2007 +0200

    Updated OpenVMS makefiles
    
    	modified:   src/mesa/descrip.mms
    	modified:   src/mesa/drivers/osmesa/descrip.mms
    	modified:   src/mesa/drivers/x11/descrip.mms
    	modified:   src/mesa/main/descrip.mms
    	modified:   src/mesa/shader/descrip.mms
    	modified:   src/mesa/shader/slang/descrip.mms
    	modified:   src/mesa/swrast/descrip.mms
    	modified:   src/mesa/swrast_setup/descrip.mms
    	modified:   src/mesa/tnl/descrip.mms




More information about the mesa-commit mailing list