Commit e1fc3396 authored by Peng Huang's avatar Peng Huang Committed by Commit Bot

Revert "Skia: Enable ExplicitlyAllocateGPUResources & SortRenderTargets."

This reverts commit 0cb76248.

Reason for revert: performance regressions

Original change's description:
> Skia: Enable ExplicitlyAllocateGPUResources & SortRenderTargets.
>
> Enable those two options which may improve skia performance.
>
> Bug: 894492
>
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Change-Id: I80a1b9d1ce018d90ab91e5e676b6d09a7dc23d8d
> Reviewed-on: https://chromium-review.googlesource.com/c/1273267
> Commit-Queue: Peng Huang <penghuang@chromium.org>
> Reviewed-by: Antoine Labour <piman@chromium.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Cr-Commit-Position: refs/heads/master@{#599321}

TBR=penghuang@chromium.org,robertphillips@google.com,piman@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 894492,895408,895384,895377,895369,895280
Change-Id: I657077091716a618d18a3d1109531e6b3819108c
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/c/1281055
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: default avatarPeng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599741}
parent 382f3853
...@@ -343,7 +343,6 @@ bool GpuServiceImpl::GetGrContextForGLSurface(gl::GLSurface* surface, ...@@ -343,7 +343,6 @@ bool GpuServiceImpl::GetGrContextForGLSurface(gl::GLSurface* surface,
GrContextOptions options; GrContextOptions options;
options.fExplicitlyAllocateGPUResources = GrContextOptions::Enable::kYes; options.fExplicitlyAllocateGPUResources = GrContextOptions::Enable::kYes;
options.fSortRenderTargets = GrContextOptions::Enable::kYes;
options.fUseGLBufferDataNullHint = GrContextOptions::Enable::kYes; options.fUseGLBufferDataNullHint = GrContextOptions::Enable::kYes;
data.gr_context = GrContext::MakeGL(std::move(native_interface), options); data.gr_context = GrContext::MakeGL(std::move(native_interface), options);
DCHECK(data.gr_context); DCHECK(data.gr_context);
......
...@@ -38,8 +38,6 @@ GrContextForGLES2Interface::GrContextForGLES2Interface( ...@@ -38,8 +38,6 @@ GrContextForGLES2Interface::GrContextForGLES2Interface(
options.fAvoidStencilBuffers = capabilities.avoid_stencil_buffers; options.fAvoidStencilBuffers = capabilities.avoid_stencil_buffers;
options.fAllowPathMaskCaching = false; options.fAllowPathMaskCaching = false;
options.fSharpenMipmappedTextures = true; options.fSharpenMipmappedTextures = true;
options.fExplicitlyAllocateGPUResources = GrContextOptions::Enable::kYes;
options.fSortRenderTargets = GrContextOptions::Enable::kYes;
sk_sp<GrGLInterface> interface( sk_sp<GrGLInterface> interface(
skia_bindings::CreateGLES2InterfaceBindings(gl, context_support)); skia_bindings::CreateGLES2InterfaceBindings(gl, context_support));
gr_context_ = GrContext::MakeGL(std::move(interface), options); gr_context_ = GrContext::MakeGL(std::move(interface), options);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment