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

Add config "glesfakev2". It runs GLES with the version faked as 2.

Browse Source 
This will allow us to do performance comparisons against the
highest available GLES on a device.

This doesn't yet enable the new config on any bots.

Change-Id: I99d0f009573969b06d5294473de009a4d6940e8d
Bug: skia:10644
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313426
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Brian Salomon 2020-08-26 15:27:03 -04:00 committed by Skia Commit-Bot
parent 64f3530dc3
commit b2b7f80c16
6 changed files with 67 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/flags/CommonFlagsConfig.cpp
View File

@ -37,6 +37,7 @@ static const struct {
} gPredefinedConfigs[] = {
{ "gl", "gpu", "api=gl" },
{ "gles", "gpu", "api=gles" },
{ "glesfakev2", "gpu", "api=glesfakev2" },
{ "glmsaa4", "gpu", "api=gl,samples=4" },
{ "glmsaa8" , "gpu", "api=gl,samples=8" },
{ "glesmsaa4", "gpu", "api=gles,samples=4" },
@ -145,6 +146,7 @@ static const char configExtendedHelp[] =
"\t Options:\n"
"\t\tgl \t\t\tUse OpenGL.\n"
"\t\tgles \t\t\tUse OpenGL ES.\n"
"\t\tglesfakev2 \t\t\tUse OpenGL ES with version faked as 2.0.\n"
"\t\tnullgl \t\t\tUse null OpenGL.\n"
"\t\tangle_d3d9_es2\t\tUse OpenGL ES2 on the ANGLE Direct3D9 backend.\n"
"\t\tangle_d3d11_es2\t\tUse OpenGL ES2 on the ANGLE Direct3D11 backend.\n"
@ -235,7 +237,9 @@ static bool parse_option_bool(const SkString& value, bool* outBool) {
return false;
}
static bool parse_option_gpu_api(const SkString& value,
SkCommandLineConfigGpu::ContextType* outContextType) {
SkCommandLineConfigGpu::ContextType* outContextType,
bool* outFakeGLESVersion2) {
*outFakeGLESVersion2 = false;
if (value.equals("gl")) {
*outContextType = GrContextFactory::kGL_ContextType;
return true;
@ -244,6 +248,11 @@ static bool parse_option_gpu_api(const SkString& value,
*outContextType = GrContextFactory::kGLES_ContextType;
return true;
}
if (value.equals("glesfakev2")) {
*outContextType = GrContextFactory::kGLES_ContextType;
*outFakeGLESVersion2 = true;
return true;
}
if (value.equals("angle_d3d9_es2")) {
*outContextType = GrContextFactory::kANGLE_D3D9_ES2_ContextType;
return true;
@ -413,12 +422,13 @@ public:
bool get_option_gpu_api(const char* optionKey,
SkCommandLineConfigGpu::ContextType* outContextType,
bool* outFakeGLESVersion2,
bool optional = true) const {
SkString* optionValue = fOptionsMap.find(SkString(optionKey));
if (optionValue == nullptr) {
return optional;
}
return parse_option_gpu_api(*optionValue, outContextType);
return parse_option_gpu_api(*optionValue, outContextType, outFakeGLESVersion2);
}
bool get_option_gpu_surf_type(const char* optionKey,
@ -454,6 +464,7 @@ private:
SkCommandLineConfigGpu::SkCommandLineConfigGpu(const SkString& tag,
const SkTArray<SkString>& viaParts,
ContextType contextType,
bool fakeGLESVersion2,
bool useDIText,
int samples,
SkColorType colorType,
@ -483,6 +494,9 @@ SkCommandLineConfigGpu::SkCommandLineConfigGpu(const SkString& tag,
if (!useStencilBuffers) {
fContextOverrides |= ContextOverrides::kAvoidStencilBuffers;
}
if (fakeGLESVersion2) {
fContextOverrides |= ContextOverrides::kFakeGLESVersionAs2;
}
}
SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString& tag,
@ -501,6 +515,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString&
bool testPrecompile = false;
bool useDDLs = false;
bool ooprish = false;
bool fakeGLESVersion2 = false;
SkCommandLineConfigGpu::SurfType surfType = SkCommandLineConfigGpu::SurfType::kDefault;
bool parseSucceeded = false;
@ -510,7 +525,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString&
}
bool validOptions =
extendedOptions.get_option_gpu_api("api", &contextType, false) &&
extendedOptions.get_option_gpu_api("api", &contextType, &fakeGLESVersion2, false) &&
extendedOptions.get_option_bool("dit", &useDIText) &&
extendedOptions.get_option_int("samples", &samples) &&
extendedOptions.get_option_gpu_color("color", &colorType, &alphaType, &colorSpace) &&
@ -530,6 +545,7 @@ SkCommandLineConfigGpu* parse_command_line_config_gpu(const SkString&
return new SkCommandLineConfigGpu(tag,
vias,
contextType,
fakeGLESVersion2,
useDIText,
samples,
colorType,

1
tools/flags/CommonFlagsConfig.h
View File

@ -54,6 +54,7 @@ public:
SkCommandLineConfigGpu(const SkString& tag,
const SkTArray<SkString>& viaParts,
ContextType contextType,
bool fakeGLESVer2,
bool useDIText,
int samples,
SkColorType colorType,

4
tools/gpu/GrContextFactory.cpp
View File

@ -223,6 +223,10 @@ ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOv
if (!glCtx) {
return ContextInfo();
}
if (glCtx->gl()->fStandard == kGLES_GrGLStandard &&
(overrides & ContextOverrides::kFakeGLESVersionAs2)) {
glCtx->overrideVersion("OpenGL ES 2.0", "OpenGL ES GLSL ES 1.00");
}
testCtx.reset(glCtx);
break;
}

1
tools/gpu/GrContextFactory.h
View File

@ -56,6 +56,7 @@ public:
enum class ContextOverrides {
kNone = 0x0,
kAvoidStencilBuffers = 0x1,
kFakeGLESVersionAs2 = 0x2,
};
static bool IsRenderingContext(ContextType type) {

40
tools/gpu/gl/GLTestContext.cpp
View File

@ -156,7 +156,8 @@ namespace sk_gpu_test {
GLTestContext::GLTestContext() : TestContext() {}
GLTestContext::~GLTestContext() {
SkASSERT(nullptr == fGL.get());
SkASSERT(!fGLInterface);
SkASSERT(!fOriginalGLInterface);
}
bool GLTestContext::isValid() const {
@ -192,7 +193,8 @@ static bool fence_is_supported(const GLTestContext* ctx) {
}
void GLTestContext::init(sk_sp<const GrGLInterface> gl) {
fGL = std::move(gl);
fGLInterface = std::move(gl);
fOriginalGLInterface = fGLInterface;
fFenceSupport = fence_is_supported(this);
fGpuTimer = GLGpuTimer::MakeIfSupported(this);
#ifndef SK_GL
@ -201,30 +203,52 @@ void GLTestContext::init(sk_sp<const GrGLInterface> gl) {
}
void GLTestContext::teardown() {
fGL.reset(nullptr);
fGLInterface.reset();
fOriginalGLInterface.reset();
INHERITED::teardown();
}
void GLTestContext::testAbandon() {
INHERITED::testAbandon();
#ifdef SK_GL
if (fGL) {
fGL->abandon();
if (fGLInterface) {
fGLInterface->abandon();
fOriginalGLInterface->abandon();
}
#endif
}
void GLTestContext::finish() {
#ifdef SK_GL
if (fGL) {
GR_GL_CALL(fGL.get(), Finish());
if (fGLInterface) {
GR_GL_CALL(fGLInterface.get(), Finish());
}
#endif
}
void GLTestContext::overrideVersion(const char* version, const char* shadingLanguageVersion) {
#ifdef SK_GL
// GrGLFunction has both a limited capture size and doesn't call a destructor when it is
// initialized with a lambda. So here we're trusting fOriginalGLInterface will be kept alive.
auto getString = [wrapped = &fOriginalGLInterface->fFunctions.fGetString,
version,
shadingLanguageVersion](GrGLenum name) {
if (name == GR_GL_VERSION) {
return reinterpret_cast<const GrGLubyte*>(version);
} else if (name == GR_GL_SHADING_LANGUAGE_VERSION) {
return reinterpret_cast<const GrGLubyte*>(shadingLanguageVersion);
}
return (*wrapped)(name);
};
auto newInterface = sk_make_sp<GrGLInterface>(*fOriginalGLInterface);
newInterface->fFunctions.fGetString = getString;
fGLInterface = std::move(newInterface);
#endif
};
sk_sp<GrDirectContext> GLTestContext::makeContext(const GrContextOptions& options) {
#ifdef SK_GL
return GrDirectContext::MakeGL(fGL, options);
return GrDirectContext::MakeGL(fGLInterface, options);
#else
return nullptr;
#endif

14
tools/gpu/gl/GLTestContext.h
View File

@ -9,6 +9,7 @@
#define GLTestContext_DEFINED
#include "include/gpu/gl/GrGLInterface.h"
#include "src/gpu/gl/GrGLUtil.h"
#include "tools/gpu/TestContext.h"
namespace sk_gpu_test {
@ -26,7 +27,7 @@ public:
/** Does this represent a successfully created GL context? */
bool isValid() const;
const GrGLInterface* gl() const { return fGL.get(); }
const GrGLInterface* gl() const { return fGLInterface.get(); }
/** Used for testing EGLImage integration. Take a GL_TEXTURE_2D and wraps it in an EGL Image */
virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return nullptr; }
@ -44,6 +45,8 @@ public:
/** Wait until all GPU work is finished. */
void finish() override;
void overrideVersion(const char* version, const char* shadingLanguageVersion);
/**
* Creates a new GL context of the same type and makes the returned context current
* (if not null).
@ -81,9 +84,12 @@ protected:
virtual GrGLFuncPtr onPlatformGetProcAddress(const char *) const = 0;
private:
/** Subclass provides the gl interface object if construction was
* successful. */
sk_sp<const GrGLInterface> fGL;
/** Subclass provides the gl interface object if construction was successful. */
sk_sp<const GrGLInterface> fOriginalGLInterface;
/** The same as fOriginalGLInterface unless the version has been overridden. */
sk_sp<const GrGLInterface> fGLInterface;
#ifndef SK_GL
bool fWasInitialized = false;
#endif