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

Remove GrTypesPriv.h dep from SkSLUtil.h when SK_SUPPORT_GPU=0

Browse Source 
Change-Id: I8f1f05d774fa69a5331f314f84e48ee726a708d6
Bug: skia:12584
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/464901
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Kevin Lubick 2021-10-28 11:19:19 -04:00
parent 4363cdb5ea
commit c82f9efc0c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sksl/SkSLCompiler.h
View File

@ -11,6 +11,7 @@
#include <set> #include <set>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include "include/core/SkSize.h"
#include "src/sksl/SkSLAnalysis.h" #include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLContext.h" #include "src/sksl/SkSLContext.h"
#include "src/sksl/SkSLInliner.h" #include "src/sksl/SkSLInliner.h"

2
src/sksl/SkSLUtil.cpp
View File

@ -31,7 +31,7 @@ void write_stringstream(const StringStream& s, OutputStream& out) {
out.write(s.str().c_str(), s.str().size()); out.write(s.str().c_str(), s.str().size());
} }
#if !defined(SKSL_STANDALONE) #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType) { bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType) {
// If a new GrSL type is added, this function will need to be updated. // If a new GrSL type is added, this function will need to be updated.
static_assert(kGrSLTypeCount == 41); static_assert(kGrSLTypeCount == 41);

4
src/sksl/SkSLUtil.h
View File

@ -17,9 +17,9 @@
#ifndef SKSL_STANDALONE #ifndef SKSL_STANDALONE
#include "include/core/SkTypes.h" #include "include/core/SkTypes.h"
#include "include/private/GrTypesPriv.h"
#if SK_SUPPORT_GPU #if SK_SUPPORT_GPU
#include "include/gpu/GrContextOptions.h" #include "include/gpu/GrContextOptions.h"
#include "include/private/GrTypesPriv.h"
#include "src/gpu/GrShaderCaps.h" #include "src/gpu/GrShaderCaps.h"
#endif // SK_SUPPORT_GPU #endif // SK_SUPPORT_GPU
#endif // SKSL_STANDALONE #endif // SKSL_STANDALONE
@ -455,7 +455,7 @@ private:
static ShaderCapsPointer MakeShaderCaps(); static ShaderCapsPointer MakeShaderCaps();
}; };
#if !defined(SKSL_STANDALONE) #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType); bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType);
#endif #endif