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

Cleanup needed to use WindowContext for Android

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055693003

Review-Url: https://codereview.chromium.org/2055693003
This commit is contained in:
djsollen 2016-06-09 13:07:13 -07:00 committed by Commit bot
parent 09b4224be3
commit 7e73108a37
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/vk/GrVkBackendContext.cpp
View File

@ -89,12 +89,12 @@ const GrVkBackendContext* GrVkBackendContext::Create(uint32_t* presentQueueIndex
instanceExtensionNames.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
extensionFlags |= kKHR_win32_surface_GrVkExtensionFlag;
}
#elif SK_BUILD_FOR_ANDROID
#elif defined(SK_BUILD_FOR_ANDROID)
if (extensions.hasInstanceExtension(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) {
instanceExtensionNames.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
extensionFlags |= kKHR_android_surface_GrVkExtensionFlag;
}
#elif SK_BUILD_FOR_UNIX
#elif defined(SK_BUILD_FOR_UNIX)
if (extensions.hasInstanceExtension(VK_KHR_XCB_SURFACE_EXTENSION_NAME)) {
instanceExtensionNames.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
extensionFlags |= kKHR_xcb_surface_GrVkExtensionFlag;

1
src/gpu/vk/GrVkProgramDesc.h
View File

@ -13,7 +13,6 @@
#include "GrGpu.h"
#include "GrTypesPriv.h"
#include "shaderc/shaderc.h"
#include "vk/GrVkDefines.h"
class GrVkGpu;

2
tools/gpu/GrContextFactory.cpp
View File

@ -19,7 +19,7 @@
#if SK_MESA
#include "gl/mesa/GLTestContext_mesa.h"
#endif
#if SK_VULKAN
#ifdef SK_VULKAN
#include "vk/VkTestContext.h"
#endif
#include "gl/null/NullGLTestContext.h"

1
tools/viewer/sk_app/WindowContext.h
View File

@ -42,6 +42,7 @@ public:
}
virtual GrBackendContext getBackendContext() = 0;
GrContext* getGrContext() const { return fContext; }
sk_sp<SkSurface> createRenderSurface(sk_sp<GrRenderTarget>, int colorBits);
void presentRenderSurface(sk_sp<SkSurface> renderSurface, sk_sp<GrRenderTarget> rt,