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

Fix checks of GR_TEST_UTILS.

Browse Source 
We had lots of checks just checking defined but we always define
GR_TEST_UTILS

Change-Id: I588c50ddd91f71618a96ab6c9eda2050b423f611
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319682
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Greg Daniel 2020-09-25 11:12:56 -04:00 committed by Skia Commit-Bot
parent d7ab450278
commit a28ea67c2a
14 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gpu/GrConfig.h
View File

@ -24,7 +24,7 @@
#endif #endif
#if !defined(GR_GPU_STATS) #if !defined(GR_GPU_STATS)
#if defined(SK_DEBUG) || defined(SK_DUMP_STATS) || defined(GR_TEST_UTILS) #if defined(SK_DEBUG) || defined(SK_DUMP_STATS) || GR_TEST_UTILS
#define GR_GPU_STATS 1 #define GR_GPU_STATS 1
#else #else
#define GR_GPU_STATS 0 #define GR_GPU_STATS 0

2
include/gpu/GrRecordingContext.h
View File

@ -233,7 +233,7 @@ private:
std::unique_ptr<GrAuditTrail> fAuditTrail; std::unique_ptr<GrAuditTrail> fAuditTrail;
#ifdef GR_TEST_UTILS #if GR_TEST_UTILS
int fSuppressWarningMessages = 0; int fSuppressWarningMessages = 0;
#endif #endif

2
src/gpu/GrClipStack.h
View File

@ -77,7 +77,7 @@ public:
GrClip::PreClipResult preApply(const SkRect& drawBounds, GrAA aa) const override; GrClip::PreClipResult preApply(const SkRect& drawBounds, GrAA aa) const override;
SkIRect getConservativeBounds() const override; SkIRect getConservativeBounds() const override;
#ifdef GR_TEST_UTILS #if GR_TEST_UTILS
GrUniqueKey testingOnly_getLastSWMaskKey() const { GrUniqueKey testingOnly_getLastSWMaskKey() const {
return fMasks.empty() ? GrUniqueKey() : fMasks.back().key(); return fMasks.empty() ? GrUniqueKey() : fMasks.back().key();
} }

2
src/gpu/GrGpu.h
View File

@ -525,10 +525,12 @@ public:
void incTextureCreates() {} void incTextureCreates() {}
void incTextureUploads() {} void incTextureUploads() {}
void incTransfersToTexture() {} void incTransfersToTexture() {}
void incTransfersFromSurface() {}
void incStencilAttachmentCreates() {} void incStencilAttachmentCreates() {}
void incNumDraws() {} void incNumDraws() {}
void incNumFailedDraws() {} void incNumFailedDraws() {}
void incNumSubmitToGpus() {} void incNumSubmitToGpus() {}
void incNumScratchTexturesReused() {}
void incNumInlineCompilationFailures() {} void incNumInlineCompilationFailures() {}
void incNumInlineProgramCacheResult(ProgramCacheResult stat) {} void incNumInlineProgramCacheResult(ProgramCacheResult stat) {}
void incNumPreCompilationFailures() {} void incNumPreCompilationFailures() {}

2
src/gpu/ccpr/GrOctoBounds.cpp
View File

@ -114,7 +114,7 @@ bool GrOctoBounds::clip(const SkIRect& clipRect) {
return true; return true;
} }
#if defined(SK_DEBUG) || defined(GR_TEST_UTILS) #if defined(SK_DEBUG) || GR_TEST_UTILS
void GrOctoBounds::validateBoundsAreTight() const { void GrOctoBounds::validateBoundsAreTight() const {
this->validateBoundsAreTight([](bool cond, const char* file, int line, const char* code) { this->validateBoundsAreTight([](bool cond, const char* file, int line, const char* code) {
SkASSERTF(cond, "%s(%d): assertion failure: \"assert(%s)\"", file, line, code); SkASSERTF(cond, "%s(%d): assertion failure: \"assert(%s)\"", file, line, code);

2
src/gpu/ccpr/GrOctoBounds.h
View File

@ -101,7 +101,7 @@ public:
constexpr static float Get_x(float x45, float y45) { return (x45 + y45) * .5f; } constexpr static float Get_x(float x45, float y45) { return (x45 + y45) * .5f; }
constexpr static float Get_y(float x45, float y45) { return (y45 - x45) * .5f; } constexpr static float Get_y(float x45, float y45) { return (y45 - x45) * .5f; }
#if defined(SK_DEBUG) || defined(GR_TEST_UTILS) #if defined(SK_DEBUG) || GR_TEST_UTILS
void validateBoundsAreTight() const; void validateBoundsAreTight() const;
void validateBoundsAreTight(const std::function<void( void validateBoundsAreTight(const std::function<void(
bool cond, const char* file, int line, const char* code)>& validateFn) const; bool cond, const char* file, int line, const char* code)>& validateFn) const;

4
src/sksl/SkSLCPPCodeGenerator.cpp
View File

@ -15,7 +15,7 @@
#include <algorithm> #include <algorithm>
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
namespace SkSL { namespace SkSL {
@ -1445,4 +1445,4 @@ bool CPPCodeGenerator::generateCode() {
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS

4
src/sksl/SkSLCPPCodeGenerator.h
View File

@ -13,7 +13,7 @@
#include <set> #include <set>
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
namespace SkSL { namespace SkSL {
@ -159,6 +159,6 @@ private:
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS
#endif // SKSL_CPPCODEGENERATOR #endif // SKSL_CPPCODEGENERATOR

4
src/sksl/SkSLCPPUniformCTypes.cpp
View File

@ -13,7 +13,7 @@
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
namespace SkSL { namespace SkSL {
@ -288,4 +288,4 @@ const UniformCTypeMapper* UniformCTypeMapper::Get(const Context& context, const
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS

4
src/sksl/SkSLCPPUniformCTypes.h
View File

@ -13,7 +13,7 @@
#include "src/sksl/ir/SkSLType.h" #include "src/sksl/ir/SkSLType.h"
#include "src/sksl/ir/SkSLVariable.h" #include "src/sksl/ir/SkSLVariable.h"
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
namespace SkSL { namespace SkSL {
@ -131,6 +131,6 @@ private:
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS
#endif // SkSLUniformCTypes_DEFINED #endif // SkSLUniformCTypes_DEFINED

4
src/sksl/SkSLCompiler.cpp
View File

@ -1823,7 +1823,7 @@ bool Compiler::toMetal(Program& program, String* out) {
return result; return result;
} }
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
bool Compiler::toCPP(Program& program, String name, OutputStream& out) { bool Compiler::toCPP(Program& program, String name, OutputStream& out) {
fSource = program.fSource.get(); fSource = program.fSource.get();
CPPCodeGenerator cg(fContext.get(), &program, this, name, &out); CPPCodeGenerator cg(fContext.get(), &program, this, name, &out);
@ -1839,7 +1839,7 @@ bool Compiler::toH(Program& program, String name, OutputStream& out) {
fSource = nullptr; fSource = nullptr;
return result; return result;
} }
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS
#endif // defined(SKSL_STANDALONE) || SK_SUPPORT_GPU #endif // defined(SKSL_STANDALONE) || SK_SUPPORT_GPU

2
src/sksl/SkSLCompiler.h
View File

@ -140,7 +140,7 @@ public:
bool toMetal(Program& program, String* out); bool toMetal(Program& program, String* out);
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
bool toCPP(Program& program, String name, OutputStream& out); bool toCPP(Program& program, String name, OutputStream& out);
bool toH(Program& program, String name, OutputStream& out); bool toH(Program& program, String name, OutputStream& out);

4
src/sksl/SkSLHCodeGenerator.cpp
View File

@ -19,7 +19,7 @@
#include <set> #include <set>
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
namespace SkSL { namespace SkSL {
@ -393,4 +393,4 @@ bool HCodeGenerator::generateCode() {
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS

4
src/sksl/SkSLHCodeGenerator.h
View File

@ -15,7 +15,7 @@
#include <cctype> #include <cctype>
#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #if defined(SKSL_STANDALONE) || GR_TEST_UTILS
constexpr const char* kFragmentProcessorHeader = constexpr const char* kFragmentProcessorHeader =
R"( R"(
@ -85,6 +85,6 @@ private:
} // namespace SkSL } // namespace SkSL
#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS) #endif // defined(SKSL_STANDALONE) || GR_TEST_UTILS
#endif // SKSL_HCODEGENERATOR #endif // SKSL_HCODEGENERATOR