| 2880df2609eba09b555ca37be04b6ad89290c765 |
|
29-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master""
When I broke android yesterday we reverted this merge to fix the breakage.
Undoing that revert so we can pull in the fix from Skia.
/external/skia/src/gpu/batches/GrBatch.cpp
|
| f7834221ac5342a3446b9b299398ea3ff7976946 |
|
28-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master"
This reverts commit 0efb99a7c27bb2c4fc1a89993da5948a4e971823.
Change-Id: I971811435410091088a932f79ddbe254fd80e79d
/external/skia/src/gpu/batches/GrBatch.cpp
|
| 1b55a963a2374a14bb82eb887bb99ee91680f0eb |
|
18-Sep-2015 |
reed <reed@chromium.org> |
Reland of add a ClassID function to GrBatch (patchset #1 id:1 of https://codereview.chromium.org/1353043002/ )
Reason for revert:
DEPS roll seems to have landed w/o this revert, so revert it again
Original issue's description:
> Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
>
> Reason for revert:
> Speculative revert to unblock DEPS roll
>
> Original issue's description:
> > add a ClassID function to GrBatch
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
> >
> > Committed: https://skia.googlesource.com/skia/+/eb44d53cf96a7eaf103a98d76079ce1f5495e343
>
> TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/48e3a45ade15c52c0c1a10cb00907dd444897745
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1344373005
/external/skia/src/gpu/batches/GrBatch.cpp
|
| 48e3a45ade15c52c0c1a10cb00907dd444897745 |
|
18-Sep-2015 |
reed <reed@chromium.org> |
Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
Reason for revert:
Speculative revert to unblock DEPS roll
Original issue's description:
> add a ClassID function to GrBatch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
>
> Committed: https://skia.googlesource.com/skia/+/eb44d53cf96a7eaf103a98d76079ce1f5495e343
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1353043002
/external/skia/src/gpu/batches/GrBatch.cpp
|
| eb44d53cf96a7eaf103a98d76079ce1f5495e343 |
|
17-Sep-2015 |
joshualitt <joshualitt@chromium.org> |
add a ClassID function to GrBatch
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
Review URL: https://codereview.chromium.org/1352813003
/external/skia/src/gpu/batches/GrBatch.cpp
|
| a7008403dcd03302e88e2df546d8427afe9e0e80 |
|
17-Sep-2015 |
joshualitt <joshualitt@google.com> |
Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
Reason for revert:
breaks mac bot
Original issue's description:
> add a ClassID function to GrBatch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1345393003
/external/skia/src/gpu/batches/GrBatch.cpp
|
| 4078d529e9e199eea13456db7bf3a63a104ab5b9 |
|
17-Sep-2015 |
joshualitt <joshualitt@chromium.org> |
add a ClassID function to GrBatch
BUG=skia:
Review URL: https://codereview.chromium.org/1352813003
/external/skia/src/gpu/batches/GrBatch.cpp
|
| 16b991390bb988b194a868ab8de66db4c21c7c13 |
|
13-Aug-2015 |
bsalomon <bsalomon@google.com> |
Split GrDrawBatch and GrVertexBatch into their own files
TBR=joshualitt@google.com
Review URL: https://codereview.chromium.org/1296483002
/external/skia/src/gpu/batches/GrBatch.cpp
|
| abd30f54b7ff1704a8930c4307ea242d09425d02 |
|
13-Aug-2015 |
bsalomon <bsalomon@google.com> |
Introduce GrBatch subclasses GrDrawBatch and GrVertexBatch to prepare for non-drawing batches
Review URL: https://codereview.chromium.org/1293583002
/external/skia/src/gpu/batches/GrBatch.cpp
|
| a387a11f9e10ee828fd0e0257cc3ee3f6262f7ca |
|
11-Aug-2015 |
bsalomon <bsalomon@google.com> |
Make GrBatch carry its own GrPipeline
Review URL: https://codereview.chromium.org/1278643006
/external/skia/src/gpu/batches/GrBatch.cpp
|
| 74417824cd988f7d6114858e09720ba00416ce11 |
|
07-Aug-2015 |
joshualitt <joshualitt@chromium.org> |
Make folder for batches
BUG=skia:
Review URL: https://codereview.chromium.org/1277233002
/external/skia/src/gpu/batches/GrBatch.cpp
|