Fix Mesa compile
authorBrian Osman <brianosman@google.com>
Wed, 22 Feb 2017 13:48:10 +0000 (08:48 -0500)
committerBrian Osman <brianosman@google.com>
Wed, 22 Feb 2017 14:20:25 +0000 (14:20 +0000)
BUG=skia:

Change-Id: Id532233537d18e6185a83681188aa73527b212a1
Reviewed-on: https://skia-review.googlesource.com/8842
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tools/gpu/gl/mesa/GLTestContext_mesa.cpp

index 33be94c..5d0014b 100644 (file)
@@ -57,7 +57,8 @@ MesaGLContext::MesaGLContext(MesaGLContext* shareContext)
         : fContext(static_cast<Context>(0))
         , fImage(nullptr) {
     GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext));
-    Context mesaShareContext = shareContext ? shareContext->fContext : nullptr;
+    OSMesaContext mesaShareContext = shareContext ? (OSMesaContext)(shareContext->fContext)
+                                                  : nullptr;
 
     /* Create an RGBA-mode context */
 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305