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 /bench/GLVertexAttributesBench.cpp | |
| 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 'bench/GLVertexAttributesBench.cpp')
| -rw-r--r-- | bench/GLVertexAttributesBench.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bench/GLVertexAttributesBench.cpp b/bench/GLVertexAttributesBench.cpp index c588f9b6b8..dfbcebe074 100644 --- a/bench/GLVertexAttributesBench.cpp +++ b/bench/GLVertexAttributesBench.cpp @@ -11,12 +11,12 @@ #if SK_SUPPORT_GPU #include "GLBench.h" +#include "GrShaderCaps.h" #include "GrShaderVar.h" #include "gl/GrGLContext.h" #include "gl/GrGLInterface.h" #include "gl/GrGLUtil.h" -#include "glsl/GrGLSL.h" -#include "glsl/GrGLSLCaps.h" +#include "../private/GrGLSL.h" #include <stdio.h> /* @@ -65,7 +65,7 @@ private: GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t attribs, uint32_t maxAttribs) { - const GrGLSLCaps* glslCaps = ctx->caps()->glslCaps(); + const GrShaderCaps* glslCaps = ctx->caps()->glslCaps(); const char* version = glslCaps->versionDeclString(); // setup vertex shader |