[Mesa-dev] Merge of glsl2 branch to master

Segovia, Benjamin benjamin.segovia at intel.com
Mon Aug 16 19:37:35 PDT 2010

I am looking at the regression for this test

From: Ian Romanick [idr at freedesktop.org]
Sent: Monday, August 16, 2010 8:17 PM
To: mesa-dev at lists.freedesktop.org; Segovia, Benjamin
Subject: Re: [Mesa-dev] Merge of glsl2 branch to master

Hash: SHA1

Ian Romanick wrote:
> Ian Romanick wrote:
>> I propose that we merge master to glsl2 on *Friday, August 13th* (one
>> week from today).  Barring unforeseen issues, I propose that we merge
>> glsl2 to master on *Monday, August 16th*.
> The master -> glsl2 merge is complete.  There don't appear to be any
> regressions in the glsl2 branch caused by the merge.  My plan is to
> merge glsl2 -> master on Monday evening, pacific time.  There are still
> three build issues with MSVC.  All three either have patches or a
> proposed fix.
> I've been working on this for almost 12 hours today, so I'm not going to
> post the combinations of test results that I usually post.  Sorry.

I just pushed the merge of glsl2->master.  One regression is created in
the merge.  On the glsl2 branch and on master there were changes to
prog_optimize.c.  Reverting the two commits from master allowed
everything to work correctly.  With the changes in master,
glsl-vs-mat-mul-1 produces incorrect results.  There are no other changes.

My hope is that this can be sorted out pretty quickly.  If worst comes
to worst, we can just revert e8000ffe and 9021c56a.

commit e8000ffeaf3a11a8173d0ffc3f3f6f4e800972d3
Author: Brian Paul <brianp at vmware.com>
Date:   Fri Aug 13 11:02:49 2010 -0600

    mesa: assorted clean-ups, var type changes, assertions in

commit 9021c56a5738815777f27c39b63637b5975270c6
Author: Benjamin Segovia <benjamin.segovia at intel.com>
Date:   Fri Aug 13 10:36:47 2010 -0600

    mesa: more/better program optimizations

    This is the patch from Benjamin's Aug 11, 2010 email with minor fixes
    (such as moving declarations before code)

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 8bbdf6e7cdfc3265439761a06eea79627f4ee2fa
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jul 27 11:45:27 2010 -0700

    mesa: Allow large temporary indices coming into the temporary reg

    This gets glsl-vs-raytrace, glsl-fs-raytrace running on the new
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/


More information about the mesa-dev mailing list