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

Fix the preallocated size of string arrays in GrGLSLShaderBuilder

Browse Source 
Fragment shaders typically have at least three (?) processors, and from
histogramming GMs and SKPs, the largest number is six. Even our vertex
shaders (half of all shaders being built) have one, and this code had an
off-by-one in the preallocation size: We set aside enough space for
kCode (10) elements, then immediately pushed 11 (i <= kCode).

This change should cut down on three heap allocations for every shader.

Bug: skia:
Change-Id: Iaa2a38b9ff82eb5b81935f9f1d1d96a9bc8aad90
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201463
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-03-18 16:45:25 -04:00 committed by Skia Commit-Bot
parent a7181e7c68
commit 389b4b267d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/glsl/GrGLSLShaderBuilder.h
View File

@ -225,12 +225,14 @@ protected:
kFunctions,
kMain,
kCode,
kPrealloc = kCode + 6, // 6 == Reasonable upper bound on number of processor stages
};
GrGLSLProgramBuilder* fProgramBuilder;
SkSTArray<kCode, const char*, true> fCompilerStrings;
SkSTArray<kCode, int, true> fCompilerStringLengths;
SkSTArray<kCode, SkString> fShaderStrings;
SkSTArray<kPrealloc, const char*, true> fCompilerStrings;
SkSTArray<kPrealloc, int, true> fCompilerStringLengths;
SkSTArray<kPrealloc, SkString> fShaderStrings;
SkString fCode;
SkString fFunctions;
SkString fExtensions;