Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: tools/gpu/gl/GLTestContext.h

Issue 1964243003: Add base class for GLTestContext and add new subclass VkTestContext. (Closed) Base URL: https://chromium.googlesource.com/skia.git@ContextInfo
Patch Set: move #include "GrVkBackendContext.h" inside #ifdef SK_VULKAN Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gpu/TestContext.cpp ('k') | tools/gpu/gl/GLTestContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gpu/gl/GLTestContext.h
diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h
index d6054a8ba6602a42aaaa414bef8705a2ea9fb0b2..a940f8dce7a31489efae0210f562a962991746da 100644
--- a/tools/gpu/gl/GLTestContext.h
+++ b/tools/gpu/gl/GLTestContext.h
@@ -8,34 +8,26 @@
#ifndef GLTestContext_DEFINED
#define GLTestContext_DEFINED
+#include "TestContext.h"
#include "gl/GrGLInterface.h"
-#include "../private/SkGpuFenceSync.h"
-
namespace sk_gpu_test {
/**
- * Create an offscreen Oppengl context. Provides a GrGLInterface struct of function pointers for
- * the context. This class is intended for Skia's internal testing needs and not for general use.
+ * An offscreen OpenGL context. Provides a GrGLInterface struct of function pointers for the context
+ * This class is intended for Skia's internal testing needs and not for general use.
*/
-class GLTestContext : public SkNoncopyable {
+class GLTestContext : public TestContext {
public:
virtual ~GLTestContext();
- bool isValid() const { return NULL != gl(); }
-
- const GrGLInterface *gl() const { return fGL.get(); }
-
- bool fenceSyncSupport() const { return fFenceSync != nullptr; }
-
- bool getMaxGpuFrameLag(int *maxFrameLag) const {
- if (!fFenceSync) {
- return false;
- }
- *maxFrameLag = kMaxFrameLag;
- return true;
+ virtual GrBackend backend() override { return kOpenGL_GrBackend; }
+ virtual GrBackendContext backendContext() override {
+ return reinterpret_cast<GrBackendContext>(fGL.get());
}
- void makeCurrent() const;
+ bool isValid() const override { return SkToBool(this->gl()); }
+
+ const GrGLInterface *gl() const { return fGL.get(); }
/** Used for testing EGLImage integration. Take a GL_TEXTURE_2D and wraps it in an EGL Image */
virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return 0; }
@@ -53,30 +45,7 @@ public:
*/
virtual GrGLuint eglImageToExternalTexture(GrEGLImage) const { return 0; }
- void swapBuffers();
-
- /**
- * The only purpose of this function it to provide a means of scheduling
- * work on the GPU (since all of the subclasses create primary buffers for
- * testing that are small and not meant to be rendered to the screen).
- *
- * If the platform supports fence sync (OpenGL 3.2+ or EGL_KHR_fence_sync),
- * this will not swap any buffers, but rather emulate triple buffer
- * synchronization using fences.
- *
- * Otherwise it will call the platform SwapBuffers method. This may or may
- * not perform some sort of synchronization, depending on whether the
- * drawing surface provided by the platform is double buffered.
- */
- void waitOnSyncOrSwap();
-
- /**
- * This notifies the context that we are deliberately testing abandoning
- * the context. It is useful for debugging contexts that would otherwise
- * test that GPU resources are properly deleted. It also allows a debugging
- * context to test that further GL calls are not made by Skia GPU code.
- */
- void testAbandon();
+ void testAbandon() override;
/**
* Creates a new GL context of the same type and makes the returned context current
@@ -84,13 +53,6 @@ public:
*/
virtual GLTestContext *createNew() const { return nullptr; }
- class GLFenceSync; // SkGpuFenceSync implementation that uses the OpenGL functionality.
-
- /*
- * returns the fencesync object owned by this GLTestContext
- */
- SkGpuFenceSync *fenceSync() { return fFenceSync.get(); }
-
protected:
GLTestContext();
@@ -99,43 +61,30 @@ protected:
*/
void init(const GrGLInterface *, SkGpuFenceSync * = NULL);
- void teardown();
-
- /*
- * Operations that have a platform-dependent implementation.
- */
- virtual void onPlatformMakeCurrent() const = 0;
-
- virtual void onPlatformSwapBuffers() const = 0;
+ void teardown() override;
virtual GrGLFuncPtr onPlatformGetProcAddress(const char *) const = 0;
private:
- enum {
- kMaxFrameLag = 3
- };
-
- SkAutoTDelete <SkGpuFenceSync> fFenceSync;
- SkPlatformGpuFence fFrameFences[kMaxFrameLag - 1];
- int fCurrentFenceIdx;
+ class GLFenceSync; // SkGpuFenceSync implementation that uses the OpenGL functionality.
/** Subclass provides the gl interface object if construction was
* successful. */
SkAutoTUnref<const GrGLInterface> fGL;
friend class GLFenceSync; // For onPlatformGetProcAddress.
-};
+ typedef TestContext INHERITED;
+};
-/** Creates platform-dependent GL context object. The shareContext parameter is in an optional
+/**
+ * Creates platform-dependent GL context object. The shareContext parameter is in an optional
* context with which to share display lists. This should be a pointer to an GLTestContext created
- * with SkCreatePlatformGLTestContext. NULL indicates that no sharing is to take place. Returns a valid
- * gl context object or NULL if such can not be created.
- * Note: If Skia embedder needs a custom GL context that sets up the GL interface, this function
- * should be implemented by the embedder. Otherwise, the default implementation for the platform
- * should be compiled in the library.
+ * with SkCreatePlatformGLTestContext. NULL indicates that no sharing is to take place. Returns a
+ * valid gl context object or NULL if such can not be created.
*/
-GLTestContext* CreatePlatformGLTestContext(GrGLStandard forcedGpuAPI, GLTestContext *shareContext = nullptr);
+GLTestContext* CreatePlatformGLTestContext(GrGLStandard forcedGpuAPI,
+ GLTestContext *shareContext = nullptr);
} // namespace sk_gpu_test
#endif
« no previous file with comments | « tools/gpu/TestContext.cpp ('k') | tools/gpu/gl/GLTestContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698