New issue
Advanced search Search tips

Issue 662630 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Nov 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

Had to pause the skia autoroll, tried to revert an old roll

Project Member Reported by ma...@chromium.org, Nov 5 2016

Issue description

Hi, 

Tried to revert a roll from a few rolls ago: https://codereview.chromium.org/2482643002/

See explanation of why I want to revert the roll. However was not successful in reverting, so leaving it up to the Skia sheriff.

Paused the autoroll in the meantime as per instructions.
 
Project Member

Comment 1 by bugdroid1@chromium.org, Nov 5 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0a84b24525fab8776503164e6b55a01d4070a64e

commit 0a84b24525fab8776503164e6b55a01d4070a64e
Author: mathp <mathp@chromium.org>
Date: Sat Nov 05 12:21:18 2016

Revert of Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits). (patchset #1 id:1 of https://codereview.chromium.org/2470913008/ )

Reason for revert:
2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption

Causing offscreen canvas test failure

https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win7%20%28dbg%29/builds/7991

Original issue's description:
> Roll src/third_party/skia/ 544da7a7c..12ae597ef (5 commits).
>
> https://chromium.googlesource.com/skia.git/+log/544da7a7c399..12ae597ef54c
>
> $ git log 544da7a7c..12ae597ef --date=short --no-merges --format='%ad %ae %s'
> 2016-11-04 herb Use alignas to force alignment.
> 2016-11-04 bsalomon Add documentation for using testing using the command buffer GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2479833003 NOTRY=true DOCS_PREVIEW= https://skia.org/?cl=2479833003
> 2016-11-04 stephana Re-enable iOS testing
> 2016-11-03 bungeman Clarify onCreateScalerContext failure modes.
> 2016-11-04 robertphillips Further centralize computation of GrSurface VRAM consumption
>
> Documentation for the AutoRoller is here:
> https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
>
> If the roll is causing failures, see:
> http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls
>
> CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
> TBR=benjaminwagner@google.com
>
> Committed: https://crrev.com/1307275bad7e590b4a6c2a800de82289a3694db3
> Cr-Commit-Position: refs/heads/master@{#429925}

TBR=benjaminwagner@google.com,skia-deps-roller@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 662630 

Review-Url: https://codereview.chromium.org/2482643002
Cr-Commit-Position: refs/heads/master@{#430163}

[modify] https://crrev.com/0a84b24525fab8776503164e6b55a01d4070a64e/DEPS

Project Member

Comment 2 by bugdroid1@chromium.org, Nov 6 2016

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f

commit ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f
Author: Ben Wagner <benjaminwagner@google.com>
Date: Sun Nov 06 12:46:37 2016

Revert "Limit GL_TEXTURE_RECTANGLE filtering to bilinear."

This reverts commit 4d53c44aa6e8e0d1b6537f83e4287e5a1423ac75.

Reason for revert: Depends on https://skia-review.googlesource.com/c/4383/ which I need to revert.

Original change's description:
> Limit GL_TEXTURE_RECTANGLE filtering to bilinear.
> 
> Adds a clamp for GrTexture filtering that can be set by a subclass at construction. The clamping is performed by GrTextureParams. GrGLTexture limits filtering to bilinear for rectangle and external textures.
> 
> Also moves samplerType() to GrTexturePriv from GrTexture.
> 
> BUG= skia:5932 
> 
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4352
> 
> Change-Id: I1f023d4f4133e7eb393367580c0558257e56c8db
> Reviewed-on: https://skia-review.googlesource.com/4352
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> 

TBR=bsalomon@google.com,csmartdalton@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 662630 

Change-Id: I012aa208594ccff0bb81bece8110a38e1f83ae00
Reviewed-on: https://skia-review.googlesource.com/4444
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/include/gpu/GrTexture.h
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/GrProgramDesc.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/GrTexture.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/GrTextureAccess.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/GrTexturePriv.h
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/effects/GrSimpleTextureEffect.h
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/gl/GrGLTexture.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/glsl/GrGLSLProgramBuilder.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/src/gpu/vk/GrVkTexture.cpp
[modify] https://crrev.com/ce4d04ae8eace6ba53ff8b8c8d8f4a2e6af4e59f/tests/RectangleTextureTest.cpp

Project Member

Comment 3 by bugdroid1@chromium.org, Nov 6 2016

The following revision refers to this bug:
  https://skia.googlesource.com/skia.git/+/9c46b68d5340efc91368cef1cc5775f13c97cab8

commit 9c46b68d5340efc91368cef1cc5775f13c97cab8
Author: Ben Wagner <benjaminwagner@google.com>
Date: Sun Nov 06 12:33:22 2016

Revert "Further centralize computation of GrSurface VRAM consumption"

This reverts commit ccd3c8937fce4bb28df19533ed043cad209e277d.

Reason for revert: Blocking Chromium roll: https://codereview.chromium.org/2482643002/

Original change's description:
> Further centralize computation of GrSurface VRAM consumption
> 
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4383
> 
> Change-Id: I054b74f2cd15f904f8e05af0fda58d6e8a523eb9
> Reviewed-on: https://skia-review.googlesource.com/4383
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> 

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 662630 

Change-Id: I186db2a41eb2bd789e6f681b3547e32d9ca374cf
Reviewed-on: https://skia-review.googlesource.com/4443
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/include/core/SkSurface.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/include/gpu/GrRenderTarget.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/include/gpu/GrSurface.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/include/gpu/GrTexture.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/GrRenderTarget.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/GrRenderTargetProxy.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/GrSurface.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/GrTexture.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/GrTextureProxy.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLGpu.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLRenderTarget.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLRenderTarget.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLTexture.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLTexture.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLTextureRenderTarget.cpp
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/gl/GrGLTextureRenderTarget.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/vk/GrVkRenderTarget.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/src/gpu/vk/GrVkTextureRenderTarget.h
[modify] https://crrev.com/9c46b68d5340efc91368cef1cc5775f13c97cab8/tests/ResourceCacheTest.cpp

Cc: benjamin...@google.com bsalo...@google.com
Owner: robertphillips@chromium.org
Thanks for tracking down the bad commit and following up!

It doesn't appear that the autoroller was ever paused (or it was later restarted). Hopefully the next deps roll succeeds.

Reassigning to robertphilips to ensure his and bsalomon's CLs get relanded.
Project Member

Comment 5 by bugdroid1@chromium.org, Nov 6 2016

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7835bffd3e3a1975a4279a441a80019249311f42

commit 7835bffd3e3a1975a4279a441a80019249311f42
Author: skia-deps-roller <skia-deps-roller@chromium.org>
Date: Sun Nov 06 14:25:24 2016

Roll src/third_party/skia/ 301dfc0bb..9c46b68d5 (2 commits).

https://skia.googlesource.com/skia.git/+log/301dfc0bba37..9c46b68d5340

$ git log 301dfc0bb..9c46b68d5 --date=short --no-merges --format='%ad %ae %s'
2016-11-06 benjaminwagner Revert "Further centralize computation of GrSurface VRAM consumption"
2016-11-06 benjaminwagner Revert "Limit GL_TEXTURE_RECTANGLE filtering to bilinear."

BUG= 662630 , 662630 

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls

CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
TBR=scroggo@google.com

Review-Url: https://codereview.chromium.org/2480113002
Cr-Commit-Position: refs/heads/master@{#430190}

[modify] https://crrev.com/7835bffd3e3a1975a4279a441a80019249311f42/DEPS

Comment 6 by ma...@chromium.org, Nov 6 2016

I'm pretty sure I clicked on stop, but the important thing is that you were
able to revert the bad commit. Thanks!
Status: Fixed (was: Assigned)

Sign in to add a comment