mesa: Changes to 'softpipe_0_1_branch'

Michal Krol michal at kemper.freedesktop.org
Fri Jul 27 10:50:54 UTC 2007


 Makefile                                         |   12 
 Makefile.mgw                                     |   11 
 configs/config.mgw                               |   42 +
 docs/README.MINGW32                              |   49 +
 include/GL/gl.h                                  |   17 
 include/GL/glut.h                                |    9 
 include/GL/mesa_wgl.h                            |   59 -
 progs/osdemos/ostest1.c                          |    7 
 progs/samples/Makefile.mgw                       |   33 -
 progs/xdemos/pbdemo.c                            |    9 
 src/glu/sgi/Makefile.mgw                         |  229 +++++++
 src/glu/sgi/libnurbs/interface/glcurveval.h      |    2 
 src/glu/sgi/libnurbs/interface/glsurfeval.cc     |    7 
 src/glu/sgi/libnurbs/interface/glsurfeval.h      |    2 
 src/glut/glx/Makefile.mgw                        |  198 ++++++
 src/glut/glx/glut_fbc.c                          |    4 
 src/glut/glx/glutint.h                           |    3 
 src/glut/glx/win32_winproc.c                     |    3 
 src/mesa/Makefile.mgw                            |   51 +
 src/mesa/drivers/dri/i810/i810state.c            |   10 
 src/mesa/drivers/dri/i810/i810tris.c             |    4 
 src/mesa/drivers/dri/i915tex/intel_batchbuffer.h |    2 
 src/mesa/drivers/dri/i915tex/intel_fbo.c         |    2 
 src/mesa/drivers/dri/i965/brw_sf_state.c         |    6 
 src/mesa/drivers/dri/mach64/mach64_native_vb.c   |    2 
 src/mesa/drivers/dri/mach64/mach64_tris.c        |   13 
 src/mesa/drivers/dri/mga/mgatris.c               |   10 
 src/mesa/drivers/dri/nouveau/nouveau_buffers.c   |    7 
 src/mesa/drivers/dri/r200/r200_state.c           |    4 
 src/mesa/drivers/dri/r300/r300_context.h         |    2 
 src/mesa/drivers/dri/r300/r300_state.c           |   38 -
 src/mesa/drivers/dri/r300/r300_vertprog.c        |  718 +++++++++++------------
 src/mesa/drivers/dri/r300/r300_vertprog.h        |    5 
 src/mesa/drivers/dri/savage/savagetris.c         |   16 
 src/mesa/drivers/dri/tdfx/tdfx_tris.c            |    2 
 src/mesa/drivers/windows/gdi/wgl.c               |   57 +
 src/mesa/drivers/windows/gdi/wmesa.c             |    7 
 src/mesa/drivers/windows/gdi/wmesadef.h          |    4 
 src/mesa/drivers/x11/fakeglx.c                   |    7 
 src/mesa/main/attrib.c                           |    4 
 src/mesa/main/buffers.c                          |   65 +-
 src/mesa/main/buffers.h                          |    3 
 src/mesa/main/context.c                          |    7 
 src/mesa/main/dd.h                               |    2 
 src/mesa/main/fbobject.c                         |   27 
 src/mesa/main/framebuffer.c                      |   37 -
 src/mesa/main/glheader.h                         |    2 
 src/mesa/main/imports.c                          |    4 
 src/mesa/main/imports.h                          |    4 
 src/mesa/main/lines.c                            |    8 
 src/mesa/main/mtypes.h                           |   39 -
 src/mesa/main/points.c                           |    5 
 src/mesa/main/shaders.c                          |    8 
 src/mesa/main/state.c                            |    4 
 src/mesa/main/texcompress_fxt1.c                 |    5 
 src/mesa/pipe/softpipe/sp_quad_fs.c              |   79 +-
 src/mesa/shader/slang/slang_codegen.c            |   40 -
 src/mesa/shader/slang/slang_emit.c               |   16 
 src/mesa/shader/slang/slang_ir.c                 |    2 
 src/mesa/shader/slang/slang_ir.h                 |    2 
 src/mesa/swrast/s_aalinetemp.h                   |    4 
 src/mesa/swrast/s_lines.c                        |   22 
 src/mesa/swrast/s_points.c                       |    8 
 src/mesa/swrast/s_span.c                         |    2 
 src/mesa/tnl/t_vertex.c                          |    2 
 src/mesa/tnl_dd/t_dd_vb.c                        |    2 
 66 files changed, 1406 insertions(+), 660 deletions(-)

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

New commits:
commit 87555946478f58111013554e5af5c8844f944420
Author: michal <michal at michal-laptop.(none)>
Date:   Fri Jul 27 12:50:38 2007 +0200

    Avoid unnecessary input attrib copy by aligning exec_machine attribs.

commit e0a26b046764ae80748b347395ab1b27de83651e
Merge: 0360b49... e3cef58...
Author: michal <michal at michal-laptop.(none)>
Date:   Fri Jul 27 10:05:40 2007 +0200

    Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch

commit e3cef5887540016a6d198598cb50bebe09e3f4cf
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Jul 26 15:32:02 2007 -0600

    Fix function call bug 11731.  Also, fix up IR_CALL/IR_FUNC confusion.

commit 9ed040c3c9afe06a8f6b28bc223751e3b2d65fe3
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Jul 26 11:39:11 2007 -0600

    generate error upon writing to varying var in fragment program (bug 11733)

commit daaee90a26d007e261932c30bcaaca0282ead088
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Jul 26 08:22:47 2007 -0600

    clamp float colors

commit 51b728cf9aff383142a2a1e220a7d8963d1ca189
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Jul 26 08:22:28 2007 -0600

    fix color interpolation for CHAN_BITS==32

commit efda5cb6263631175aa2efe46df9322b3c5775ee
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Jul 26 08:22:09 2007 -0600

    don't use rgba_line() if CHAN_BITS==32

commit 03ec41ddc51e539c989a546f33d22daa2af69095
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Jul 24 17:45:14 2007 -0600

    remove unused MAX_3D_TEXTURE_SIZE, reformattting

commit 5b6858c023fca9d8eefce78121aabd9aad108e09
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Jul 24 09:56:44 2007 -0600

    call ctx->Driver.NewProgram() instead of _mesa_new_program()

commit ffc633c469d5056a8f3766243279cdf64b0f98c3
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Jul 24 09:19:22 2007 -0600

    fix logic error, typos

commit da2f1e88bc63403a95b89706905c070b7c894863
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Jul 23 16:51:57 2007 -0600

    fix GLX_STEREO handling (bug 11705)

commit 76fb8089103e9dba9aaa7232c86d864d5874a08f
Author: Zhang <zxpmyth at yahoo.com.cn>
Date:   Sat Jul 21 11:28:06 2007 -0600

    Fix a number of MINGW32 issues

commit af2aa8e9cf88a9ee3ec338eddc9a47bf2f142cb7
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Sat Jul 21 10:06:18 2007 -0600

    Remove ctx->Point._Size and ctx->Line._Width.
    
    The clamping for these values depends on whether we're drawing AA or non-AA
    points, lines.  Defer clamping until drawing time.  Drivers could compute and
    keep clamped AA and clamped non-AA values if desired.

commit 5842bc3bf9e33333b122ce7fd6bf108aab780111
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Sat Jul 21 10:04:14 2007 -0600

    remove VC6/VC7 project files until updated

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

    fix bogus recently introduced function param comments

commit a1bc0d0f51c2aa248a349283c3b86ae2c72af4aa
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 6075df53b5435ddada989d776d989132def363a6
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 f9ac01eac511aa9ea0b8b48774022a08d0fc2f3b
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Thu Jul 19 17:58:21 2007 +0200

    fix up mesa's probably bogus framebuffer updates with different read/write fbs
    
    Conflicts:
    
    	src/mesa/main/framebuffer.c

commit dbfb375805d94cb80262b8816c67a8adc778bec5
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 b9f2cf9a4e0a5ec89b27371210846942c93cb412
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 0b48ce450eef91a9fcf6681260beb1090e0ef9d1
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jul 18 02:59:08 2007 +0000

    r300: Oops, made a mistake on commit fb4e071beda6e3b9e68a21bbc7649b6c4733c485.

commit 86ece0a920d8afa870608a25745be8d03b7cccb6
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Wed Jul 18 02:49:26 2007 +0000

    r300: Cleaned up vertprog construction.
    
    Construct the vertprog instruction in the 4 DWORD parts...
    
    DWORD 0: Opcode and Output.
    DWORD 1: First Argument.
    DWORD 2: Second Argument.
    DWORD 3: Third Argument.
    
    Allow the opcode translation functions to generate more than one instruction;
    useful for when an instruction must be emulated. FLR, XPD, etc.

commit fb4e071beda6e3b9e68a21bbc7649b6c4733c485
Author: Tommy Schultz Lassen <mesa3d at krynn.dk>
Date:   Wed Jul 18 00:37:43 2007 +0000

    r300: Corrected texcoord start when BFC1 is enabled.




More information about the mesa-commit mailing list