mesa: Changes to 'softpipe_0_1_branch'

Tue Jul 31 13:41:15 UTC 2007

 src/mesa/drivers/dri/common/dri_util.c            |    8 
 src/mesa/drivers/dri/common/drirenderbuffer.c     |    4 
 src/mesa/drivers/dri/i915tex/i830_state.c         |   10 
 src/mesa/drivers/dri/i915tex/i830_vtbl.c          |   25 -
 src/mesa/drivers/dri/i915tex/i915_context.h       |    6 
 src/mesa/drivers/dri/i915tex/i915_fragprog.c      |    8 
 src/mesa/drivers/dri/i915tex/i915_state.c         |   46 ---
 src/mesa/drivers/dri/i915tex/i915_vtbl.c          |    8 
 src/mesa/drivers/dri/i915tex/intel_blit.c         |   96 +++----
 src/mesa/drivers/dri/i915tex/intel_blit.h         |    2 
 src/mesa/drivers/dri/i915tex/intel_buffers.c      |  290 +--------------------
 src/mesa/drivers/dri/i915tex/intel_buffers.h      |    4 
 src/mesa/drivers/dri/i915tex/intel_context.c      |   78 +----
 src/mesa/drivers/dri/i915tex/intel_context.h      |   25 -
 src/mesa/drivers/dri/i915tex/intel_fbo.c          |  119 --------
 src/mesa/drivers/dri/i915tex/intel_fbo.h          |    4 
 src/mesa/drivers/dri/i915tex/intel_ioctl.c        |    3 
 src/mesa/drivers/dri/i915tex/intel_pixel.c        |    3 
 src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c |   25 -
 src/mesa/drivers/dri/i915tex/intel_pixel_copy.c   |  219 +++++++---------
 src/mesa/drivers/dri/i915tex/intel_pixel_draw.c   |  107 +++++--
 src/mesa/drivers/dri/i915tex/intel_pixel_read.c   |  190 +++++++------
 src/mesa/drivers/dri/i915tex/intel_render.c       |    2 
 src/mesa/drivers/dri/i915tex/intel_screen.c       |  301 +---------------------
 src/mesa/drivers/dri/i915tex/intel_screen.h       |   15 -
 src/mesa/drivers/dri/i915tex/intel_span.c         |   30 --
 src/mesa/drivers/dri/i915tex/intel_state.c        |    2 
 src/mesa/drivers/dri/i915tex/intel_tex_copy.c     |   19 -
 28 files changed, 470 insertions(+), 1179 deletions(-)

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

New commits:
commit 9273150f9a8394f4ef630a96f0089ad8cad607f5
Merge: 9bc1c92... 7aefdd5...
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Tue Jul 31 14:37:45 2007 +0100

    Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
    
    Conflicts:
    
    	src/mesa/drivers/dri/i915tex/intel_buffers.c
    	src/mesa/drivers/dri/i915tex/intel_context.c
    	src/mesa/drivers/dri/i915tex/intel_fbo.c
    	src/mesa/drivers/dri/i915tex/intel_pixel_draw.c

commit 7aefdd518578687f961bb512a2b408857f0b9824
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 29 19:40:50 2007 +0200

    fix range reduction for sin/cos in i915tex (#11609)

commit 9d2d34b5eabfb7855081ad56fa00b3e0f6b8e631
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 29 18:04:28 2007 +0200

    Fix crashes when the frag prog can't be handled in hardware (#11131)
    
    Must not change to/from swrast after Render.Start or bad things will happen.
    (Driver will still somewhat incorrectly report an implementation error,
    and apps can't really figure out if a prog is natively supported as validation
    is later - could try doing it earlier to give some hint at least, even though
    native status may still change later due to fog etc.)

commit 36fce66034887009749c3d52587c293da2457820
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sat Jul 21 16:51:15 2007 +0200

    set the _BaseFormat for window-framebuffers, could hit some assertion otherwise

commit 118bd626b10d213eb022ac2618bf2efc5fe734d1
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Fri Jul 20 11:34:26 2007 +0200

    fix bogus recently introduced function param comments

commit 97cd87ef74eb06aa8da52be42871120cca145269
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Fri Jul 20 11:33:24 2007 +0200

    minor cleanups, disable debugging

commit e0850e52eed52ff4e2acac6b31a7c456eb9716a0
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 19 18:11:48 2007 +0200

    remove some more really old ifdefed out code...

commit 79ddb7f9a27421089efea090de6c41d2d630bb8f
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 19 17:42:14 2007 +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...

commit da21eff86be088852457cdcb725aed5337c4519d
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 19 16:41:14 2007 +0200

    fix drawables not getting freed if context is made current with new drawables

commit 131a03631208afb1fce90292eb27115511f58257
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 18 20:17:14 2007 +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.

commit 3f318c2eb98cf7216ae7033806fa764ac40192bf
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 18 18:07:12 2007 +0200

    more fixes for mesa's fbo handling (fixes tests/fbotest1/2)

commit ccb713cdb8831617880ac71ac357361b586d05c6
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 18 15:18:43 2007 +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.

commit c5a8bc712542d24a035aa8fe58cf3c28c7c6fbd1
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 20:06:44 2007 +0200

    get rid of checks for old ddx

commit 7664105fc2a27ae0862edff66a0a5a33e4111fe1
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 19:49:25 2007 +0200

    remove some more old stuff

commit 881d71495b893516d685e3c68b60c0aa2742d2a7
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 19:37:05 2007 +0200

    get rid of more pageflip/rotation code.

commit a8bf93e00e28031d7e2444f79df2686f262b4420
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 19:22:23 2007 +0200

    fix up mesa's probably bogus framebuffer updates with different read/write fbs

commit d9499a151df85fef6bb6f31b58657e44cadba50a
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 17:29:55 2007 +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).

commit 04d49ff24d0f9c7c3a99c45b50f62aa32b0a28ed
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 15:56:43 2007 +0200

    remove old code, remaining bits of static handles, disable (no longer functional anyway) rotation code

commit 4dd8e2648d7ec8634d1005aae2da562b57b0267f
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Jul 17 12:56:30 2007 +0200

    increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)

commit cc9cf90b090b80e51ac03af6fe113287e083accd
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 20:53:33 2007 +0200

    fix resize bugs (fb size updated too late), fix typos, cleanups...

commit 5fc7973d5493039e4b3037eae10e9a005d4cf717
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 19:01:47 2007 +0200

    small cleanups

commit 894557d625b6813dfb23602b96fde6a59d3db54e
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 17:41:22 2007 +0200

    get rid of more cliprects...

commit 56cbdfd7d541e5d99b7e7c4fb7b03ac6ac1536a1
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 15:53:23 2007 +0200

    more cliprect elimination (swrast span)

commit 6104044f6bd9464b5972234f95801ca6ba5db510
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 15:33:09 2007 +0200

    get rid of more fake cliprects (drawpixel), and enable blit draw with scissor

commit 8b93d9238e4dd51acaf95c4744d5f6a795d9d35c
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 13:57:49 2007 +0200

    get rid of more cliprects (readpixel)...

commit d69cae95a072d3641bd8340a5216662e0365ed6f
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 16 11:51:08 2007 +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).

commit 99c7e38d8363eafe2fc079ed6e7bad289d65e965
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 15 22:53:59 2007 +0200

    change back driver change from previous commit

commit a1ec23a30f3ff9583b32428c2c357b9ef66f3a50
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 15 22:47:42 2007 +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).

commit 8172f50419b370c4608d1bbc6cac4d77e3e45804
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 15 20:15:19 2007 +0200

    fix the texture copypixels path

commit cd3afa2a952a9ec05fb9fa959dfe90d620bd2d88
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sun Jul 15 18:17:36 2007 +0200

    begin getting rid of fake clip rects (copy_pixel)

commit a04056d313a8346dc9e6e1b062762a6f115d1b46
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sat Jul 14 14:24:20 2007 +0200

    fix assertion, z/stencil swarst readback, (still looks suspicious) copyTexSubimage

commit f022bff5aa828cfdbb4749f672fc51c345f9cb33
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Fri Jul 13 20:47:17 2007 +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.

commit 8b6517abfc20dc508c2a4cb1f6f22f34a8a70805
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 12 21:52:02 2007 +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).

commit 9870f7bccc55f9b1728fa8b9ed78a72ab15d7f4f
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Jul 11 20:18:51 2007 +0200

    restrict blitted area to size of rendered area