diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-07-01 08:22:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-01 08:22:01 -0700 |
| commit | b3058bdb1049ca75d526eb9f11e1a42a49e63585 (patch) | |
| tree | 9d72636cd37c2100869fcd02041072b19b86a717 /src/gpu/vk/GrVkGpu.h | |
| parent | e7d1b24ff0a04686aef54fcb9feaca7a03e19891 (diff) | |
initial checkin of SkSL compiler
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1984363002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/1984363002
Diffstat (limited to 'src/gpu/vk/GrVkGpu.h')
| -rw-r--r-- | src/gpu/vk/GrVkGpu.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h index 3373abd0f8..542917e9d0 100644 --- a/src/gpu/vk/GrVkGpu.h +++ b/src/gpu/vk/GrVkGpu.h @@ -8,6 +8,8 @@ #ifndef GrVkGpu_DEFINED #define GrVkGpu_DEFINED +#define USE_SKSL 1 + #include "GrGpu.h" #include "GrGpuFactory.h" #include "vk/GrVkBackendContext.h" @@ -18,7 +20,14 @@ #include "GrVkVertexBuffer.h" #include "GrVkUtil.h" +#if USE_SKSL +namespace SkSL { + class Compiler; +} +#else #include "shaderc/shaderc.h" +#endif + #include "vk/GrVkDefines.h" class GrPipeline; @@ -111,9 +120,15 @@ public: bool byRegion, VkImageMemoryBarrier* barrier) const; +#if USE_SKSL + SkSL::Compiler* shaderCompiler() const { + return fCompiler; + } +#else shaderc_compiler_t shadercCompiler() const { return fCompiler; } +#endif void submitSecondaryCommandBuffer(const GrVkSecondaryCommandBuffer*, const GrVkRenderPass*, @@ -242,10 +257,13 @@ private: VkDebugReportCallbackEXT fCallback; #endif +#if USE_SKSL + SkSL::Compiler* fCompiler; +#else // Shaderc compiler used for compiling glsl in spirv. We only want to create the compiler once // since there is significant overhead to the first compile of any compiler. shaderc_compiler_t fCompiler; - +#endif typedef GrGpu INHERITED; }; |