The idea here is to move the mapping of GrGlyph to atlas location into the GrAtlasManager.
The only thing left in the GrGlyph will be the PackedGlyphID and the width/height.
Bug: 1056730
Change-Id: I6f85780eddbab701100599198b70edfed0c434dc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279915
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Herb Derby <herb@google.com>
This reverts commit 8176508cc6.
Replaces incorrect check for Read pixels support with Write check.
Change-Id: Idc80aaaa41ba35014339df450bb8b583fb6dab51
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280399
Auto-Submit: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
1b2dd6f92a..05fa1a9991
git log 1b2dd6f92a6b..05fa1a99914a --date=short --first-parent --format='%ad %ae %s'
2020-03-31 ynovikov@chromium.org Skip test flaky on SwANGLE bots
2020-03-30 geofflang@chromium.org Update the active texture cache before changing the texture binding.
2020-03-30 sugoi@google.com Add support for NV_read_depth, NV_read_stencil and NV_depth_buffer_float2 extensions
2020-03-30 cwallez@chromium.org Revert "Enable blob cache when debugging"
2020-03-30 cnorthrop@google.com Vulkan: Expose extension for ETC1 usage with subimage updates
2020-03-30 courtneygo@google.com Enable blob cache when debugging
2020-03-30 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/vulkan-validation-layers/src 55f01953d6e9..9a0f2d99fd5d (4 commits)
2020-03-30 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/SwiftShader 02e15b249b12..1c29477aa06e (19 commits)
2020-03-30 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/vulkan-loader/src cc481ef27631..b0c27ce32864 (2 commits)
2020-03-30 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/glslang/src 99508c1ce389..344bd0889ac9 (4 commits)
Created with:
gclient setdep -r third_party/externals/angle2@05fa1a99914a
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-skia-autoroll
Please CC michaelludwig@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
Cq-Include-Trybots: skia/skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia/skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
Bug: None
Tbr: michaelludwig@google.com
Change-Id: I8dfd9228f2d593ad6b165dec65e9610ed1c95b76
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280540
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Allow push_back to take an rvalue to move into the allocator, which has
the nice side effect of making the test for it a bit better.
Change-Id: I7e313cf75c1ad65fbf765b10c4717672063b5570
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280412
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Change-Id: I60a3569b47b599b710c0f3a9522241748f15360d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280409
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
It was too easy to get into circular include chains. Added static
asserts to ensure we keep our quad AA flags in sync. Also, IWYU.
Change-Id: I01aefa264aa56420ab5a46a8ecd9e63c021c79ab
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280405
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Bug: skia:9935
Change-Id: Ic5f745f404373fa80303c95004fe4744c6bf292b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280407
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Auto-Submit: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
This reverts commit aa8bf26dc2.
Reason for revert: d3d9 failures
Original change's description:
> Assert that all GrCaps colortype/format -> swizzle queries are legal.
>
> Otherwise they silently fall back to "rgba".
>
> Change-Id: I9a4dcfc99ae52f156b6dfc367665eb0129b6b03d
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280336
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: I05940da3ae6d93e7a0b44790b8051ce3221e62d7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280403
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Adds some writepixels caps methods even though it's not implemented,
just to keep dm from crashing in unexpected places.
Bug: skia:9935
Change-Id: Ia76e5abd8a6c72987658af4f8369efe69f6b685c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279576
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Otherwise they silently fall back to "rgba".
Change-Id: I9a4dcfc99ae52f156b6dfc367665eb0129b6b03d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280336
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Add Dawn's dependencies shaderc and glslang, and roll SPIRV. Update the
BUILD.gn files to match upstream changes.
Bug: skia:9939, chromium:1064563
Change-Id: Ie9720806efe823312da10f7911688f12cad0713e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/278770
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
Adds the ANGLE extension to our list of options for
glDraw*BaseInstance.
Removes glDrawElementsInstancedBaseInstance since this method is not
supported by the ANGLE extension.
Change-Id: Ifd25324feeaad55a4d141b5064bcd8e059948ef7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280388
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
With all those new toys it's just as clear to use skvm::Builder
without inheriting from it.
Change-Id: I105973db465d889ded528f476a479232f6e70391
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280335
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Just a typo. Rewritten to make premul vs. unpremul stand out more.
Change-Id: I6db425a97a1333a6c5d2e867115c7f77f73d0482
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280378
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Expand the core animator logic to return whether the computed value is
changing on each tick. Also rename tick/onTick -> seek/onSeek to better
reflect Skottie semantics.
This information allows us to skip adapter updates for static/hold
animation segments.
This effectively hoists some of the scene graph lazy-update logic to the
Skottie model level, and culls unneeded conversions (e.g. we were
converting ShapeValue -> SkPath on every tick, even when the shape was
not changing).
TBR=
Change-Id: I1ea4e19ae8f993d659826269de6b0465fec70189
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279816
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Previously the size of one of the keys was passed to memcmp.
It was incorrectly assumed that if the size mismatched in the
first word compared then the rest of the keys would not be
accessed.
Change-Id: I9850949c6b51d0d2fb6de53ed8d4dee5192826d2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280356
Commit-Queue: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Flutter's code has been updated so these can all be removed
Change-Id: Id3b778158fce175efd23b80a1d1245106c848501
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279840
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This doesn't usually come up because third_party/ is mostly
only C code and clang-tidy only runs on C++ code, but it's
starting to matter as we roll in Dawn.
Change-Id: I52c64cd55281989dad837d6573c38e8b380861a3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280329
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
We can infer the builder on any method that's got at least one I32/F32
argument. That's basically everything but splat, uniform??, and load??.
This will let us write things like
sqrt(x*x + y*y)
instead of
p->sqrt(x*x + y*y)
Previously we had to inherit from skvm::Builder for that...
I think we can remove all that inheritance once I fill all this out.
To make the impl. terser, give I32/F32 an operator-> for their Builder.
Open question about whether to add operator>>? operator<< is
unambiguous, but operator>> on I32 is probably just going to be
more confusing than sticking with shr and sra.
Change-Id: Id7f1334f87e2354c8733a93d510569df38ae861e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280318
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Instead separately check texturability and uploadability using existing
queries.
Also remove unused renderable param from onGetDefaultBackendFormat()
Change-Id: I8751e6d62263ddabd713c850beb788620a78bf10
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279996
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
negate(x) -> -x
Change-Id: I920b1abe473325309562ca29be6384bedd7e6a42
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280317
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>
inv(x) -> 1-x
Change-Id: If64591f4f3ce15eb487222f052fc4bd1bac97977
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280316
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>
That last patch was too ambitious: the existing logic is error-prone,
and to fix it would require implementing a whole side algebra for
immediates. I don't really want to have a second side system, even if
we work out how to make it correct.
If instead we just require a few more splats, we can come up with a
simple sane system that at least can't blow up on you unexpectedly.
- Strip F32/I32 back down to a Builder pointer and Val ID,
but create F32a/I32a for use as method arguments that
can auto-construct from an immediate or the normal type.
- Add method overloads using F32a/I32a.
- Add operators using F32a/I32a and int/float primitive types,
guaranteeing there's at least one F32/I32 to get a Builder from.
- To keep things simple, drop all the operator forward declarations.
They're only needed for inline methods on Builder, and there
are few enough of them that calling methods is fine.
- TODO: some of the inline helpers become simple enough
when written with operators they might not need to exist,
e.g. inv(x) -> (1-x).
Change-Id: I193b0e5bca5617ab564c769b916473434ad6d56d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280276
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
f2bee3043a..1b2dd6f92a
git log f2bee3043a5e..1b2dd6f92a6b --date=short --first-parent --format='%ad %ae %s'
2020-03-28 timvp@google.com Vulkan: Refactor varying validation for separable programs
2020-03-28 timvp@google.com Vulkan: Move ProgramInfo/ShaderInfo to ProgramExecutableVk
2020-03-28 timvp@google.com Vulkan: Create TransformSpirvCode()
2020-03-28 timvp@google.com Vulkan: Make mVariableInfoMap a gl::ShaderMap<>
2020-03-28 timvp@google.com Vulkan: Only calculate variable locations once
2020-03-28 timvp@google.com Create the ProgramExecutableVk Class
2020-03-28 ynovikov@chromium.org Skip KHR-GLES31.core.shader_image_load_store.advanced-allMips-* tests
2020-03-27 jmadill@chromium.org Vulkan: Mask out Depth/Stencil RTs in feedback loops.
2020-03-27 timvp@google.com Vulkan: Move cached samplers/images and has*() to ProgramExecutable
2020-03-27 jmadill@chromium.org Fix feedback loop clearing detection.
2020-03-27 jmadill@chromium.org Update OWNERS information.
2020-03-27 jmadill@chromium.org Support masking out DS feedback loops in RenderTargetCache.
2020-03-27 geofflang@chromium.org D3D11: Serialize and deserialze mImage2DUniforms.
2020-03-27 timvp@google.com Create the ProgramExecutable Class
2020-03-27 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/vulkan-loader/src acbf316040c3..cc481ef27631 (1 commits)
2020-03-27 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/glslang/src 2df8c71258de..99508c1ce389 (1 commits)
2020-03-27 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/vulkan-validation-layers/src 443c2caa1714..55f01953d6e9 (1 commits)
2020-03-27 angle-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/SwiftShader 77090261dabc..02e15b249b12 (8 commits)
Created with:
gclient setdep -r third_party/externals/angle2@1b2dd6f92a6b
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-skia-autoroll
Please CC michaelludwig@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
Cq-Include-Trybots: skia/skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia/skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
Bug: None
Tbr: michaelludwig@google.com
Change-Id: I5335357194cb04ab024cf3d422b137196dcb6630
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280298
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
It would be nice if we could use infix operators, and it would also be
nice if we could use literals instead of so many splats.
To make infix operators possible, we need to have each I32 / F32 struct
track its origin Builder, so that we know where to build the
corresponding operation when we encounter an infix operator. E.g.
struct F32 {
Val id = NA;
Builder* builder = ...;
};
...
static inline F32 operator*(F32 x, F32 y) {
SkASSERT(x.builder == y.builder);
return x.builder->mul(x,y);
}
OK, that's great! But then once we start churning out overrides to work
with literals, things get quite verbose, and it becomes easy to lose
track of which methods can take literals and which can't. It'd be nice
to have some sort of way to automatically handle literals.
For that we notice that the F32 struct has 4 dead bytes anyway between
the Val and the Builder*... perfect space for a literal.
struct F32 {
Val id = NA;
float imm = 0.0f;
Builder* builder = nulltpr;
};
Now we can operate under the convention that when builder == nullptr,
the F32 represents the value in `imm`, and when builder is set it is
the result of the instruction at `id`.
Then inside skvm::Builder, we'll look for F32's that are in that sort
of Builder-less imm state and resolve them to splats. That's what id()
does, returning that `id` val. I've renamed the field in the struct to
make sure I caught all the old uses of `.id`.
From there we make I32 and F32 much more locked down types, with three
public constructors: NA/false, immediates, and instruction values.
There's lots and lots and lots and lots and lots left to do both
removing splat()s and especially converting to infix. I just tried
to get enough in here that proves it works.
luminance() has weird extra parens to preserve the order of evaluation,
but I don't see any reason not to drop them in a follow up.
Change-Id: If6889ec9ba1ecc23edb15361ccb2b2309be7a6b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279907
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
GCC 9 warns about this pessimizing-move. It isn't clear why clang isn't
as well.
GCC 9 has a working redundant-move diagnostic. Clang has an old (C++11
style) redundant-move diagnostic which only warns when moving a
parameter. The GCC warning conflicts with Clang's
return-std-move-in-c++11, which we want to keep until we can drop
support for older compilers. So just disable redundant-move warnings
until we can remove return-std-move-in-c++11.
This change allows us to compile without warnings on gcc 9.3.0.
Change-Id: If21fcfb2944ce49e27fc84d40805752895ae68cf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279958
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Precusor step for making this public and adding a method to
GrBackendFormat to query its channels.
Bug: skia:10078
Change-Id: I2d8fa6586721c35961bc328a15eef8e2ebd4406e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279422
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Change-Id: I51a0b5cb9c14f44f3af9cd8748f4e1c866f3441c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280096
Auto-Submit: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Change-Id: If918db1153f6b5bf7057e00f3d36113fc88d889d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279919
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
iMac Pro bench:
- RP: 167
- VM exp: 195
- VM quartics: 135
Change-Id: Ie8deb38f246b9ae7bbd35e59c3e7e66fc7c42de5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279918
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Mike Reed <reed@google.com>
These attrib types don't have equivalents in d3d12 and they are not used
so just deleting them.
Change-Id: Iff63525d36e0674847e07a13254f321c27aca7bc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279864
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
There is little reason for the Text Ops to be carrying around a pointer to this.
Additionally, this removes creation and initialization of this table from the DDL recording text contexts.
Bug: 1056730
Change-Id: Ie28ec479c35e4d4412954aa4c0104c4eed6fca3f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279837
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Put static variable for GrManagedResource in its cpp file.
Properly initialize options2 struct.
Bug: skia:9935
Change-Id: I56853c8c99fe804225555b81bd796e713dd0ef05
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279863
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
GCC version 9 added a diagnostic about
‘memset’ used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
In SkSLInterpreter.h, make it obvious to both the compiler and reader of
the code that the intention is to memset the first element of the array.
Change-Id: I9531eb220a39d3fc31e9faad3649f39204e74dc1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279861
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
