diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-12-04 12:40:05 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-04 13:18:24 +0000 |
| commit | 4e9265253af55c2ff54d52abe5c361c85da36bf4 (patch) | |
| tree | 3c4d679661f91ad292408288cca6f698d6158252 /src | |
| parent | a0985d960fb7c2010274a0fb4a8aa771ece6dc1f (diff) | |
Revert "Revert "Enable explicit GPU resource allocation""
This reverts commit 537473317ca19014c5a092313854d8938505def6.
Reason for revert: Fix has landed (let's try again)
Original change's description:
> Revert "Enable explicit GPU resource allocation"
>
> This reverts commit 733965adceaf3f8488ed45c508e252bcfa4b84f9.
>
> Reason for revert: Intel NUCs failures on gltestthreading config
>
> Original change's description:
> > Enable explicit GPU resource allocation
> >
> > I think there is a low probability this will stick but we have to try sometime.
> >
> > Change-Id: Id79d55b4e0daf5b3dd0e8a56034e3d478c77606d
> > Reviewed-on: https://skia-review.googlesource.com/78221
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Robert Phillips <robertphillips@google.com>
>
> TBR=bsalomon@google.com,robertphillips@google.com
>
> Change-Id: Ie782b352d7f6a8e385564106678e0b1bf507053a
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/78560
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I9289e9ade59b38c4214160283faa2d0c8ac71824
Reviewed-on: https://skia-review.googlesource.com/79540
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrOpList.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h index 8e9babd63e..31c8212119 100644 --- a/src/gpu/GrOpList.h +++ b/src/gpu/GrOpList.h @@ -15,9 +15,9 @@ // Turn on/off the explicit distribution of GPU resources at flush time -#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION - #define SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION -#endif +//#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION +// #define SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION +//#endif // Turn on/off the sorting of opLists at flush time #ifndef SK_DISABLE_RENDER_TARGET_SORTING |