| commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Tue Nov 29 13:43:05 2016 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Tue Nov 29 19:32:31 2016 +0000 |
| tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca | |
| parent | e11b614795bbe707d131ad599ead5be452e7c06f [diff] [blame] |
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>
diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 8354a8d..8229362 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp
@@ -9,10 +9,10 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrContextFactory.h" +#include "GrShaderCaps.h" #include "gl/GrGLGpu.h" #include "gl/GrGLUtil.h" #include "gl/GLTestContext.h" -#include "glsl/GrGLSLCaps.h" using sk_gpu_test::GLTestContext;