b4d895606f
This reverts commita55e214bbe. Reason for revert:google3 should be fixed now Original change's description: > Revert "Reland "Always include public/include headers for vulkan and just guard src files with SK_VULKAN."" > > This reverts commit55aea84baa. > > Reason for revert: Google3 roll failing like > > third_party/skia/HEAD/include/gpu/vk/GrVkDefines.h:15:10: fatal error: '../../../third_party/vulkan/SkiaVulkan.h' file not found > #include "../../../third_party/vulkan/SkiaVulkan.h" > > > Original change's description: > > Reland "Always include public/include headers for vulkan and just guard src files with SK_VULKAN." > > > > This reverts commit684b506f35. > > > > Reason for revert: Chrome change has landed to fix broken chrome roll. > > > > Original change's description: > > > Revert "Always include public/include headers for vulkan and just guard src files with SK_VULKAN." > > > > > > This reverts commit6e2d607334. > > > > > > Reason for revert: chrome roll > > > > > > Original change's description: > > > > Always include public/include headers for vulkan and just guard src files with SK_VULKAN. > > > > > > > > This should allow a client to build a skia library that doesn't use vulkan but still > > > > has all the public headers defined so that they don't have to build two versions of > > > > their code. > > > > > > > > Bug: chromium:862144 > > > > Change-Id: I0eecbe0bc48123619f217e2cf318eb9a8c77ccb2 > > > > Reviewed-on: https://skia-review.googlesource.com/158661 > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > TBR=egdaniel@google.com,bsalomon@google.com,cblume@chromium.org > > > > > > Change-Id: I76ae6f435333755fa5d546fc1e5999a324b4fd05 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: chromium:862144 > > > Reviewed-on: https://skia-review.googlesource.com/c/159000 > > > Reviewed-by: Mike Klein <mtklein@google.com> > > > Commit-Queue: Mike Klein <mtklein@google.com> > > > > TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com,cblume@chromium.org > > > > Change-Id: Id019b428f880efbd7ead8dee4178c6190469a290 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: chromium:862144 > > Reviewed-on: https://skia-review.googlesource.com/c/159145 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com,cblume@chromium.org > > Change-Id: I0e5c72e2d79dac28021b02168a9e11ac08db765c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: chromium:862144 > Reviewed-on: https://skia-review.googlesource.com/c/159155 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> TBR=egdaniel@google.com,mtklein@google.com,bsalomon@google.com,cblume@chromium.org Change-Id: I58f7f8ca5281cd5fe0c145c01e9b9465c9b9ec31 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:862144 Reviewed-on: https://skia-review.googlesource.com/159260 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
67 lines
1.6 KiB
C++
67 lines
1.6 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef GrBackendSemaphore_DEFINED
|
|
#define GrBackendSemaphore_DEFINED
|
|
|
|
#include "GrTypes.h"
|
|
|
|
#include "gl/GrGLTypes.h"
|
|
#include "vk/GrVkTypes.h"
|
|
|
|
/**
|
|
* Wrapper class for passing into and receiving data from Ganesh about a backend semaphore object.
|
|
*/
|
|
class GrBackendSemaphore {
|
|
public:
|
|
// For convenience we just set the backend here to OpenGL. The GrBackendSemaphore cannot be used
|
|
// until either initGL or initVulkan are called which will set the appropriate GrBackend.
|
|
GrBackendSemaphore() : fBackend(kOpenGL_GrBackend), fGLSync(0), fIsInitialized(false) {}
|
|
|
|
void initGL(GrGLsync sync) {
|
|
fBackend = kOpenGL_GrBackend;
|
|
fGLSync = sync;
|
|
fIsInitialized = true;
|
|
}
|
|
|
|
void initVulkan(VkSemaphore semaphore) {
|
|
fBackend = kVulkan_GrBackend;
|
|
fVkSemaphore = semaphore;
|
|
#ifdef SK_VULKAN
|
|
fIsInitialized = true;
|
|
#else
|
|
fIsInitialized = false;
|
|
#endif
|
|
}
|
|
|
|
bool isInitialized() const { return fIsInitialized; }
|
|
|
|
GrGLsync glSync() const {
|
|
if (!fIsInitialized || kOpenGL_GrBackend != fBackend) {
|
|
return 0;
|
|
}
|
|
return fGLSync;
|
|
}
|
|
|
|
VkSemaphore vkSemaphore() const {
|
|
if (!fIsInitialized || kVulkan_GrBackend != fBackend) {
|
|
return VK_NULL_HANDLE;
|
|
}
|
|
return fVkSemaphore;
|
|
}
|
|
|
|
private:
|
|
GrBackend fBackend;
|
|
union {
|
|
GrGLsync fGLSync;
|
|
VkSemaphore fVkSemaphore;
|
|
};
|
|
bool fIsInitialized;
|
|
};
|
|
|
|
#endif
|