move duplicated SwapControlData to rendergl_utils.

src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp

@@ -86,11 +86,6 @@ int ChooseCRTC(int fd, drmModeConnectorPtr conn)
 namespace rx
 {
 
-// TODO(fjhenigman) Implement swap control.  Until then this is unused.
-SwapControlData::SwapControlData()
-    : targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
-{}
-
 DisplayGbm::Buffer::Buffer(DisplayGbm *display,
                            uint32_t useFlags,
                            uint32_t gbmFormat,

src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h

@@ -30,21 +30,9 @@ namespace rx
 class FramebufferGL;
 class RendererEGL;
 
-// TODO(fjhenigman) Implement swap control.  The following struct will be used for that.
-// State-tracking data for the swap control to allow DisplayGbm to remember per
-// drawable information for swap control.
-struct SwapControlData final
-{
-    SwapControlData();
-
-    // Set by the drawable
-    int targetSwapInterval;
-
-    // DisplayGbm-side state-tracking
-    int maxSwapInterval;
-    int currentSwapInterval;
-};
+struct SwapControlData;
 
+// TODO(fjhenigman) Implement swap control.  The SwapControlData struct will be used for that.
 class DisplayGbm final : public DisplayEGL
 {
   public:

src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h

@@ -11,6 +11,7 @@
 
 #include "libANGLE/renderer/gl/SurfaceGL.h"
 #include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
+#include "libANGLE/renderer/gl/renderergl_utils.h"
 
 namespace rx
 {

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

@@ -43,10 +43,6 @@ static int IgnoreX11Errors(Display *, XErrorEvent *)
     return 0;
 }
 
-SwapControlData::SwapControlData()
-    : targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
-{}
-
 class FunctionsGLGLX : public FunctionsGL
 {
   public:

src/libANGLE/renderer/gl/glx/DisplayGLX.h

@@ -22,19 +22,7 @@ namespace rx
 class FunctionsGLX;
 class WorkerContext;
 
-// State-tracking data for the swap control to allow DisplayGLX to remember per
-// drawable information for swap control.
-struct SwapControlData
-{
-    SwapControlData();
-
-    // Set by the drawable
-    int targetSwapInterval;
-
-    // DisplayGLX-side state-tracking
-    int maxSwapInterval;
-    int currentSwapInterval;
-};
+struct SwapControlData;
 
 class DisplayGLX : public DisplayGL
 {

src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h

@@ -12,6 +12,7 @@
 #include "libANGLE/renderer/gl/glx/DisplayGLX.h"
 #include "libANGLE/renderer/gl/glx/SurfaceGLX.h"
 #include "libANGLE/renderer/gl/glx/platform_glx.h"
+#include "libANGLE/renderer/gl/renderergl_utils.h"
 
 namespace rx
 {

src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -36,6 +36,10 @@ using angle::CheckedNumeric;
 namespace rx
 {
 
+SwapControlData::SwapControlData()
+    : targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
+{}
+
 VendorID GetVendorID(const FunctionsGL *functions)
 {
     std::string nativeVendorString(reinterpret_cast<const char *>(functions->getString(GL_VENDOR)));

src/libANGLE/renderer/gl/renderergl_utils.h

@@ -47,6 +47,20 @@ enum class MultiviewImplementationTypeGL
     UNSPECIFIED
 };
 
+// State-tracking data for the swap control to allow DisplayGL to remember per
+// drawable information for swap control.
+struct SwapControlData
+{
+    SwapControlData();
+
+    // Set by the drawable
+    int targetSwapInterval;
+
+    // DisplayGL-side state-tracking
+    int maxSwapInterval;
+    int currentSwapInterval;
+};
+
 VendorID GetVendorID(const FunctionsGL *functions);
 
 // Helpers for extracting the GL helper objects out of a context