mesa: Changes to 'master'

Nan hai Zou znh at kemper.freedesktop.org
Fri Oct 26 07:46:45 UTC 2007


 progs/glsl/CH11-toyball.frag.txt          |    7 
 progs/glsl/CH11-toyball.vert.txt          |    7 
 src/mesa/drivers/dri/i965/Makefile        |    1 
 src/mesa/drivers/dri/i965/brw_clip.h      |    4 
 src/mesa/drivers/dri/i965/brw_context.c   |   27 
 src/mesa/drivers/dri/i965/brw_eu.h        |   17 
 src/mesa/drivers/dri/i965/brw_eu_emit.c   |   44 
 src/mesa/drivers/dri/i965/brw_gs.h        |    4 
 src/mesa/drivers/dri/i965/brw_sf.h        |    2 
 src/mesa/drivers/dri/i965/brw_vs.h        |    6 
 src/mesa/drivers/dri/i965/brw_vs_emit.c   |  255 ++++-
 src/mesa/drivers/dri/i965/brw_vs_tnl.c    |    2 
 src/mesa/drivers/dri/i965/brw_wm.c        |   84 -
 src/mesa/drivers/dri/i965/brw_wm.h        |   12 
 src/mesa/drivers/dri/i965/brw_wm_emit.c   |  112 +-
 src/mesa/drivers/dri/i965/brw_wm_fp.c     |   53 -
 src/mesa/drivers/dri/i965/brw_wm_glsl.c   | 1354 ++++++++++++++++++++++++++++++
 src/mesa/drivers/dri/i965/brw_wm_pass0.c  |    4 
 src/mesa/drivers/dri/i965/brw_wm_pass1.c  |    5 
 src/mesa/drivers/dri/i965/brw_wm_pass2.c  |    2 
 src/mesa/drivers/dri/i965/brw_wm_state.c  |    7 
 src/mesa/drivers/dri/i965/intel_context.c |   14 
 src/mesa/main/texenvprogram.c             |    2 
 src/mesa/shader/program.c                 |    2 
 src/mesa/shader/slang/slang_codegen.c     |    1 
 25 files changed, 1863 insertions(+), 165 deletions(-)

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

New commits:
commit 6ef27b88e6f767cd476676b33cb7c4ea6922234e
Merge: ff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8 de803f538c16096c9e241cfdddc092ac2aa2504e
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Oct 26 15:39:50 2007 +0800

    Merge branch '965-glsl'
    
    Conflicts:
    
    	src/mesa/drivers/dri/i965/brw_sf.h
    	src/mesa/drivers/dri/i965/intel_context.c

commit de803f538c16096c9e241cfdddc092ac2aa2504e
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Oct 9 15:05:10 2007 +0800

      Non Square Matrix

commit ae5aa1f90651a2a6168f687c95a069e78a0231bb
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Oct 9 14:35:28 2007 +0800

     fix for prev commit

commit e2dff35f9589dd5616933654a2136584cb30ed18
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Oct 9 14:26:01 2007 +0800

      INT support

commit 82d4aa40551fe86a04346c3eea944f8ce7ae8d28
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Oct 9 14:14:59 2007 +0800

      shadow sampler fix.
      1. spec requite result (0, 0, 0, 1) instead of (0, 0, 0, 0)
      2. support shadow sampler in simd8

commit ac985708f4820173bdc4509d032bdabeb93a0590
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Mon Oct 8 15:34:03 2007 +0800

      Only vertex program fix, bypass tnl vertex program

commit 3d6c4109902b555a3f8076170d572c7caeb6cbfe
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Sun Sep 30 13:47:05 2007 +0800

     fragment shader function call fix, gl_FragCoord fix

commit b0b48798c7e854d2e36e0317bf94b7385e815242
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Sat Sep 29 15:00:52 2007 +0800

     support continue, fix conditional

commit e75ae0dc792b9fe599b68d7a9ea0ab22413da424
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Sep 28 17:04:48 2007 +0800

     fix

commit 4087c90effecdf2f466e2ddcf88ec2faf0db034f
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Sep 28 16:37:01 2007 +0800

    support nested function call in pixel shader

commit b1e549d1762536ebb3f7c11461c4554d4613c37a
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Sep 27 16:17:24 2007 +0800

     handle INT op, still require high level handle of integer to be correct

commit 35a0634e358baac832d6e5a76630fcae57a948a7
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Sep 27 15:47:00 2007 +0800

     fix issue when only fragment shader or vertex shader is used

commit ec9e7bc753316cebed9c9ce12aa5513486c6b8d0
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Sep 18 12:59:50 2007 +0800

     ARB_shader_object ARB_vertex_shader ARB_fragment_shader in 965-glsl branch

commit 25bda451bbdbc51a7a4346e2c809f335fb46db72
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Sep 18 11:32:25 2007 +0800

    fix double free in 965-glsl branch

commit c702a7100e2aa83241e89850a97bcc23e1c6fedb
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 24 11:09:34 2007 +0800

      DDX DDY support, not very accurate

commit c6d042acc94411b63f922ef68f24aa5426c0a69e
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 17 16:52:03 2007 +0800

      Fix SOP in fragment shader, brick is ok now.

commit 3c00cdc5f37856f303a6256677364ae89200c509
Merge: 24e7acd5e4f1e7e71909f94fd1f075abd268d086 7b410f366fa117a03a7e838562215d2dca3f8cbc
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 17 15:42:39 2007 +0800

    Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl

commit 24e7acd5e4f1e7e71909f94fd1f075abd268d086
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 17 11:25:37 2007 +0800

     bumpmap sample is correct now

commit 719cf0b7958d0dedf8727c97eaddb6a1f31977e1
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 17 11:19:52 2007 +0800

     Use ProgramStringNotify

commit 575f3e918f00bdc0faa4a173820015b24175696f
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Jul 5 11:10:24 2007 +0800

     support "discard";

commit fb9ee9b323bff93973a39560b2bc007aace4bddd
Merge: 285b326c606e9b2f90e4fe177b15b3fa23239b86 7ff4359a3be1278b26950f96ab23014a667af838
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Wed Jul 4 10:52:35 2007 +0800

    Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl

commit 285b326c606e9b2f90e4fe177b15b3fa23239b86
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Wed Jul 4 10:51:57 2007 +0800

     fix issue with output as src register.

commit 4fc02ad000a0948ab77306980492924f5beebc0a
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Jul 3 15:27:43 2007 +0800

     Fix a nasty bug...

commit d19d0596daf004b56d80f78fa1a329b43c2ebf94
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Jun 21 10:22:28 2007 +0800

      support branch and loop in pixel shader
      most of the sample working with some small modification

commit 58eac1bbf320b4104c3158aaeca4726f1a59daf9
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Wed May 9 10:08:10 2007 +0800

      Support loop, conditional update fix

commit a78b26fff04026a24189ecad7ec85bfe0df2cce1
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Mon Apr 30 15:24:38 2007 +0800

      support nested function call
      else instruction fix.

commit 35707dbe57873adb5a8088cd47c13bd216e143e4
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Apr 12 09:43:00 2007 +0800

      Initial 965 GLSL support




More information about the mesa-commit mailing list