AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use int when possible to calculate atlas indices in shaders.

Browse Source 
On certain iOS devices half has a mantissa of only 10 bits, which is not
enough to perform the floating point trickery to get the lower bits
out of the "texture coordinates". Instead we use int if available, and
float if not available.

Also re-enables multitexturing for iOS and adds a sample which
stresses the issue, and a version of fontcache that tests multitexturing.

Bug: skia:7285
Change-Id: Ia541b6a418c1860c941071750ceb26459eb846ea
Reviewed-on: https://skia-review.googlesource.com/99800
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2018-01-25 16:26:25 -05:00 committed by Skia Commit-Bot
parent fc807c885b
commit fc4f768e5a
8 changed files with 223 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gm/fontcache.cpp
View File

@ -5,6 +5,13 @@
* found in the LICENSE file.
*/
// GM to stress the GPU font cache
// It's not necessary to run this with CPU configs
#include "gm.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "GrContextOptions.h"
#include "SkCanvas.h"
@ -14,8 +21,6 @@
#include "gm.h"
#include "sk_tool_utils.h"
// GM to stress the GPU font cache
static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x,
SkScalar y, const SkPaint& paint) {
canvas->drawString(text, x, y, paint);
@ -24,16 +29,23 @@ static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x,
class FontCacheGM : public skiagm::GM {
public:
FontCacheGM() { this->setBGColor(SK_ColorLTGRAY); }
FontCacheGM(GrContextOptions::Enable allowMultipleTextures)
: fAllowMultipleTextures(allowMultipleTextures) {
this->setBGColor(SK_ColorLTGRAY);
}
void modifyGrContextOptions(GrContextOptions* options) override {
options->fGlyphCacheTextureMaximumBytes = 0;
options->fAllowMultipleGlyphCacheTextures = GrContextOptions::Enable::kNo;
options->fAllowMultipleGlyphCacheTextures = fAllowMultipleTextures;
}
protected:
SkString onShortName() override {
return SkString("fontcache");
SkString name("fontcache");
if (GrContextOptions::Enable::kYes == fAllowMultipleTextures) {
name.append("-mt");
}
return name;
}
SkISize onISize() override { return SkISize::Make(kSize, kSize); }
@ -49,9 +61,15 @@ protected:
}
void onDraw(SkCanvas* canvas) override {
GrRenderTargetContext* renderTargetContext =
canvas->internal_private_accessTopLayerRenderTargetContext();
if (!renderTargetContext) {
skiagm::GM::DrawGpuOnlyMessage(canvas);
return;
}
canvas->clear(SK_ColorLTGRAY);
this->drawText(canvas);
#if SK_SUPPORT_GPU
// Debugging tool for GPU.
static const bool kShowAtlas = false;
if (kShowAtlas) {
@ -60,7 +78,6 @@ protected:
canvas->drawImage(img, 0, 0);
}
}
#endif
}
private:
@ -83,6 +100,10 @@ private:
SkScalar subpixelY = 0;
bool offsetX = true;
if (GrContextOptions::Enable::kYes == fAllowMultipleTextures) {
canvas->scale(10, 10);
}
do {
for (auto s : kSizes) {
auto size = 2 * s;
@ -109,6 +130,7 @@ private:
static constexpr SkScalar kSize = 1280;
GrContextOptions::Enable fAllowMultipleTextures;
sk_sp<SkTypeface> fTypefaces[6];
typedef GM INHERITED;
};
@ -117,4 +139,7 @@ constexpr SkScalar FontCacheGM::kSize;
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new FontCacheGM;)
DEF_GM(return new FontCacheGM(GrContextOptions::Enable::kNo))
DEF_GM(return new FontCacheGM(GrContextOptions::Enable::kYes))
#endif

1
gn/samples.gni
View File

@ -47,6 +47,7 @@ samples_sources = [
"$_samplecode/SampleFilter2.cpp",
"$_samplecode/SampleFilterFuzz.cpp",
"$_samplecode/SampleFilterQuality.cpp",
"$_samplecode/SampleFlutterAnimate.cpp",
"$_samplecode/SampleFontScalerTest.cpp",
"$_samplecode/SampleFuzz.cpp",
"$_samplecode/SampleGradients.cpp",

115
samplecode/SampleFlutterAnimate.cpp Normal file
View File

@ -0,0 +1,115 @@
/*
* Copyright 2018 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SampleCode.h"
#include "SkAnimTimer.h"
#include "SkView.h"
#include "SkCanvas.h"
#include "SkUtils.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkImage.h"
#include "SkRandom.h"
#include "SkTime.h"
#include "SkTypeface.h"
#include "Timer.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
#endif
// Create an animation of a bunch of letters that rotate in place. This is intended to stress
// the glyph atlas and test that we don't see corruption or bad slowdowns.
class FlutterAnimateView : public SampleView {
public:
FlutterAnimateView() : fCurrTime(0), fResetTime(0) {}
protected:
void onOnceBeforeDraw() override {
fTypeface = SkTypeface::MakeFromFile("/skimages/samplefont.ttf");
initChars();
}
// overrides from SkEventSink
bool onQuery(SkEvent* evt) override {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "FlutterAnimate");
return true;
}
return this->INHERITED::onQuery(evt);
}
void onDrawContent(SkCanvas* canvas) override {
SkPaint paint;
paint.setTypeface(fTypeface);
paint.setAntiAlias(true);
paint.setFilterQuality(kMedium_SkFilterQuality);
paint.setTextSize(50);
// rough center of each glyph
static constexpr auto kMidX = 35;
static constexpr auto kMidY = 50;
canvas->clear(SK_ColorWHITE);
for (int i = 0; i < kNumChars; ++i) {
canvas->save();
double rot = SkScalarInterp(fChars[i].fStartRotation, fChars[i].fEndRotation,
fCurrTime/kDuration);
canvas->translate(fChars[i].fPosition.fX + kMidX, fChars[i].fPosition.fY - kMidY);
canvas->rotate(SkRadiansToDegrees(rot));
canvas->translate(-35,+50);
canvas->drawString(fChars[i].fChar, 0, 0, paint);
canvas->restore();
}
}
bool onAnimate(const SkAnimTimer& timer) override {
fCurrTime = timer.secs() - fResetTime;
if (fCurrTime > kDuration) {
this->initChars();
fResetTime = timer.secs();
fCurrTime = 0;
}
return true;
}
private:
void initChars() {
for (int i = 0; i < kNumChars; ++i) {
char c = fRand.nextULessThan(26) + 65;
fChars[i].fChar[0] = c;
fChars[i].fChar[1] = '\0';
fChars[i].fPosition = SkPoint::Make(fRand.nextF()*748 + 10, fRand.nextF()*1004 + 10);
fChars[i].fStartRotation = fRand.nextF();
fChars[i].fEndRotation = fRand.nextF() * 20 - 10;
}
}
static constexpr double kDuration = 5.0;
double fCurrTime;
double fResetTime;
SkRandom fRand;
struct AnimatedChar {
char fChar[2];
SkPoint fPosition;
SkScalar fStartRotation;
SkScalar fEndRotation;
};
sk_sp<SkTypeface> fTypeface;
static constexpr int kNumChars = 40;
AnimatedChar fChars[kNumChars];
typedef SampleView INHERITED;
};
//////////////////////////////////////////////////////////////////////////////
static SkView* MyFactory() { return new FlutterAnimateView; }
static SkViewRegister reg(MyFactory);

16
src/gpu/GrContext.cpp
View File

@ -277,20 +277,12 @@ bool GrContext::init(const GrContextOptions& options) {
new GrDrawingManager(this, prcOptions, atlasTextContextOptions, &fSingleOwner));
GrDrawOpAtlas::AllowMultitexturing allowMultitexturing;
switch (options.fAllowMultipleGlyphCacheTextures) {
case GrContextOptions::Enable::kDefault:
#ifdef SK_BUILD_FOR_IOS
if (GrContextOptions::Enable::kNo == options.fAllowMultipleGlyphCacheTextures ||
// multitexturing supported only if range can represent the index + texcoords fully
!(fCaps->shaderCaps()->floatIs32Bits() || fCaps->shaderCaps()->integerSupport())) {
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kNo;
#else
} else {
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes;
#endif
break;
case GrContextOptions::Enable::kNo:
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kNo;
break;
case GrContextOptions::Enable::kYes:
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes;
break;
}
fAtlasGlyphCache = new GrAtlasGlyphCache(this, options.fGlyphCacheTextureMaximumBytes,
allowMultitexturing);

24
src/gpu/effects/GrAtlasedShaderHelpers.h
View File

@ -8,6 +8,7 @@
#ifndef GrAtlasedShaderHelpers_DEFINED
#define GrAtlasedShaderHelpers_DEFINED
#include "GrShaderCaps.h"
#include "glsl/GrGLSLPrimitiveProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLVarying.h"
@ -22,22 +23,33 @@ static void append_index_uv_varyings(GrGLSLPrimitiveProcessor::EmitArgs& args,
// This extracts the texture index and texel coordinates from the same variable
// Packing structure: texel coordinates are multiplied by 2 (or shifted left 1)
// texture index is stored as lower bits of both x and y
args.fVertBuilder->codeAppendf("half2 indexTexCoords = half2(%s.x, %s.y);",
if (args.fShaderCaps->integerSupport()) {
args.fVertBuilder->codeAppendf("int2 signedCoords = int2(%s.x, %s.y);",
inTexCoordsName, inTexCoordsName);
args.fVertBuilder->codeAppend("half2 intCoords = floor(0.5*indexTexCoords);");
args.fVertBuilder->codeAppend("half2 diff = indexTexCoords - 2.0*intCoords;");
args.fVertBuilder->codeAppend("half texIdx = 2.0*diff.x + diff.y;");
args.fVertBuilder->codeAppend("int texIdx = 2*(signedCoords.x & 0x1) + (signedCoords.y & 0x1);");
args.fVertBuilder->codeAppend("float2 unormTexCoords = float2(signedCoords.x/2, signedCoords.y/2);");
} else {
args.fVertBuilder->codeAppendf("float2 indexTexCoords = float2(%s.x, %s.y);",
inTexCoordsName, inTexCoordsName);
args.fVertBuilder->codeAppend("float2 unormTexCoords = floor(0.5*indexTexCoords);");
args.fVertBuilder->codeAppend("float2 diff = indexTexCoords - 2.0*unormTexCoords;");
args.fVertBuilder->codeAppend("float texIdx = 2.0*diff.x + diff.y;");
}
// Multiply by 1/atlasSize to get normalized texture coordinates
args.fVaryingHandler->addVarying("TextureCoords", uv);
args.fVertBuilder->codeAppendf("%s = intCoords * %s;", uv->vsOut(), atlasSizeInvName);
args.fVertBuilder->codeAppendf("%s = unormTexCoords * %s;", uv->vsOut(), atlasSizeInvName);
if (args.fShaderCaps->integerSupport()) {
args.fVaryingHandler->addFlatVarying("TexIndex", texIdx);
} else {
args.fVaryingHandler->addVarying("TexIndex", texIdx);
}
args.fVertBuilder->codeAppendf("%s = texIdx;", texIdx->vsOut());
if (st) {
args.fVaryingHandler->addVarying("IntTextureCoords", st);
args.fVertBuilder->codeAppendf("%s = intCoords;", st->vsOut());
args.fVertBuilder->codeAppendf("%s = unormTexCoords;", st->vsOut());
}
}

3
src/gpu/effects/GrBitmapTextGeoProc.cpp
View File

@ -38,7 +38,8 @@ public:
&atlasSizeInvName);
GrGLSLVarying uv(kFloat2_GrSLType);
GrGLSLVarying texIdx(kHalf_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
append_index_uv_varyings(args, btgp.inTextureCoords()->fName, atlasSizeInvName,
&uv, &texIdx, nullptr);

9
src/gpu/effects/GrDistanceFieldGeoProc.cpp
View File

@ -66,7 +66,8 @@ public:
// add varyings
GrGLSLVarying uv(kFloat2_GrSLType);
GrGLSLVarying texIdx(kHalf_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
append_index_uv_varyings(args, dfTexEffect.inTextureCoords()->fName, atlasSizeInvName,
&uv, &texIdx, &st);
@ -325,7 +326,8 @@ public:
&atlasSizeInvName);
GrGLSLVarying uv(kFloat2_GrSLType);
GrGLSLVarying texIdx(kHalf_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
append_index_uv_varyings(args, dfPathEffect.inTextureCoords()->fName, atlasSizeInvName, &uv,
&texIdx, &st);
@ -608,7 +610,8 @@ public:
// set up varyings
GrGLSLVarying uv(kFloat2_GrSLType);
GrGLSLVarying texIdx(kHalf_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
append_index_uv_varyings(args, dfTexEffect.inTextureCoords()->fName, atlasSizeInvName,
&uv, &texIdx, &st);

40
src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp
View File

@ -38,6 +38,11 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
bool useDistanceFields, SkScalar transX, SkScalar transY,
GrColor color) {
uint16_t u0, v0, u1, v1;
#ifdef DISPLAY_PAGE_INDEX
// Enable this to visualize the page from which each glyph is being drawn.
// Green Red Magenta Cyan -> 0 1 2 3; Black -> error
SkColor hackColor;
#endif
if (regenTexCoords) {
SkASSERT(glyph);
int width = glyph->fBounds.width();
@ -67,6 +72,25 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
u1 |= uBit;
v1 <<= 1;
v1 |= vBit;
#ifdef DISPLAY_PAGE_INDEX
switch (pageIndex) {
case 0:
hackColor = SK_ColorGREEN;
break;
case 1:
hackColor = SK_ColorRED;
break;
case 2:
hackColor = SK_ColorMAGENTA;
break;
case 3:
hackColor = SK_ColorCYAN;
break;
default:
hackColor = SK_ColorBLACK;
break;
}
#endif
}
// This is a bit wonky, but sometimes we have LCD text, in which case we won't have color
@ -90,6 +114,10 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
uint16_t* textureCoords = reinterpret_cast<uint16_t*>(vertex + texCoordOffset);
textureCoords[0] = u0;
textureCoords[1] = v0;
#ifdef DISPLAY_PAGE_INDEX
SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
*vcolor = hackColor;
#endif
}
vertex += vertexStride;
@ -109,6 +137,10 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
uint16_t* textureCoords = reinterpret_cast<uint16_t*>(vertex + texCoordOffset);
textureCoords[0] = u0;
textureCoords[1] = v1;
#ifdef DISPLAY_PAGE_INDEX
SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
*vcolor = hackColor;
#endif
}
vertex += vertexStride;
@ -128,6 +160,10 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
uint16_t* textureCoords = reinterpret_cast<uint16_t*>(vertex + texCoordOffset);
textureCoords[0] = u1;
textureCoords[1] = v0;
#ifdef DISPLAY_PAGE_INDEX
SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
*vcolor = hackColor;
#endif
}
vertex += vertexStride;
@ -147,6 +183,10 @@ inline void regen_vertices(char* vertex, const GrGlyph* glyph, size_t vertexStri
uint16_t* textureCoords = reinterpret_cast<uint16_t*>(vertex + texCoordOffset);
textureCoords[0] = u1;
textureCoords[1] = v1;
#ifdef DISPLAY_PAGE_INDEX
SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
*vcolor = hackColor;
#endif
}
}