diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 19:32:31 +0000 |
| commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 (patch) | |
| tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca /src/gpu/glsl/GrGLSLProgramBuilder.h | |
| parent | e11b614795bbe707d131ad599ead5be452e7c06f (diff) | |
Merge GrGLSLCaps into GrShaderCaps
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121
Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 5543537d19..fdb6e11c14 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -8,6 +8,7 @@ #ifndef GrGLSLProgramBuilder_DEFINED #define GrGLSLProgramBuilder_DEFINED +#include "GrCaps.h" #include "GrGeometryProcessor.h" #include "GrGpu.h" #include "glsl/GrGLSLFragmentProcessor.h" @@ -19,10 +20,10 @@ #include "glsl/GrGLSLVertexShaderBuilder.h" #include "glsl/GrGLSLXferProcessor.h" -class GrGLSLCaps; class GrShaderVar; class GrGLSLVaryingHandler; class GrGLSLExpr4; +class GrShaderCaps; typedef SkSTArray<8, GrGLSLFragmentProcessor*, true> GrGLSLFragProcs; @@ -35,7 +36,7 @@ public: virtual ~GrGLSLProgramBuilder() {} virtual const GrCaps* caps() const = 0; - virtual const GrGLSLCaps* glslCaps() const = 0; + const GrShaderCaps* shaderCaps() const { return this->caps()->shaderCaps(); } const GrPrimitiveProcessor& primitiveProcessor() const { return fPrimProc; } const GrPipeline& pipeline() const { return fPipeline; } |