Commit 9216ada5 authored by Kelsey Gilbert's avatar Kelsey Gilbert
Browse files

Bug 1864587 - [esr115] [angle] Vendor mozilla/angle/firefox-115. r=gfx-reviewers, a=dmeehan 

Differential Revision: https://phabricator.services.mozilla.com/D198114
parent 2489f004

gfx/angle/checkout/out/gen/angle/angle_commit.h

+3 −3
Original line number Diff line number Diff line 
#define ANGLE_COMMIT_HASH "6784271c1c62"

#define ANGLE_COMMIT_HASH "fa03ab3adeaf"

#define ANGLE_COMMIT_HASH_SIZE 12

#define ANGLE_COMMIT_DATE "2023-07-20 16:31:09 -0400"

#define ANGLE_COMMIT_POSITION 19735

#define ANGLE_COMMIT_DATE "2024-01-09 17:44:29 -0800"

#define ANGLE_COMMIT_POSITION 19736

#define ANGLE_HAS_BINARY_LOADING

gfx/angle/checkout/src/compiler/translator/VariablePacker.cpp

+9 −10
Original line number Diff line number Diff line
@@ -239,12 +239,11 @@ bool VariablePacker::checkExpandedVariablesWithinPackingLimits( 
            break;

        }

        topNonFullRow_ += GetVariablePackingRows(variable);

    }



        if (topNonFullRow_ > maxRows_)

        {

            return false;

        }

    }



    // Packs the 3 column variables.

    int num3ColumnRows = 0;
@@ -255,13 +254,13 @@ bool VariablePacker::checkExpandedVariablesWithinPackingLimits( 
        {

            break;

        }

        num3ColumnRows += GetVariablePackingRows(variable);

    }



        num3ColumnRows += GetVariablePackingRows(variable);

        if (topNonFullRow_ + num3ColumnRows > maxRows_)

        {

            return false;

        }

    }



    fillColumns(topNonFullRow_, num3ColumnRows, 0, 3);

gfx/angle/cherry_picks.txt

+22 −0
Original line number Diff line number Diff line 
commit fa03ab3adeaf286dbbfbf63ecb4fad33978ca5db

Author: Geoff Lang <geofflang@chromium.org>

Date:   Fri Dec 8 13:20:36 2023 -0500



    Validate Uniform variable limits with each iteration

    

    VariablePacker would loop over all variables and sum up the total

    row counts before validating. Each variable can take hundreds of rows

    so it is possible to overflow the counters before validating them.

    

    Validate the limits with each iteration and early-out when the limits

    are exceeded.

    

    https://bugzilla.mozilla.org/show_bug.cgi?id=1864587

    

    Bug: chromium:1864587

    Change-Id: Ic235ada1516a0d5a9948d82b22f6316a037c09ca

    Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5106408

    Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

    Auto-Submit: Geoff Lang <geofflang@chromium.org>

    Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>



commit 6784271c1c6273a1be0b6a2dad9ac7b921521ad8

Author: Shahbaz Youssefi <syoussefi@chromium.org>

Date:   Tue Mar 28 11:43:23 2023 -0400

gfx/angle/update-angle.py

+4 −3
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ An easy choice is to grab Chrome's Beta's ANGLE branch. 


Prepare your env:



~~~

export PATH="$PATH:/path/to/depot_tools"

~~~

* If in `cmd`:

    `export PATH="$PATH:/path/to/depot_tools"`

* If in `powershell`:

    `$env:Path += ";C:\path\to\depot_tools"`



If this is a new repo, don't forget: