Bug 919987 - pass surface as an EGLSurface, not a void* - r=jgilbert
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 15 Nov 2013 12:33:51 -0500
changeset 154899 845997a86b37a1d6ca25f4be63a4a729df95afd4
parent 154898 be4b587cbee29815ff195c1a9354a609edf24c65
child 154900 7867eea4136a5e14355183878249d8226c66d99f
push id2477
push userbjacob@mozilla.com
push dateFri, 15 Nov 2013 17:34:14 +0000
treeherderb2g-inbound@845997a86b37 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs919987
milestone28.0a1
Bug 919987 - pass surface as an EGLSurface, not a void* - r=jgilbert
gfx/gl/GLContext.h
gfx/gl/GLContextProviderEGL.cpp
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -2455,17 +2455,17 @@ public:
      * If surf is non-null, this sets it to temporarily override this context's
      * primary surface. This makes this context current against this surface,
      * and subsequent MakeCurrent calls will continue using this surface as long
      * as this override is set.
      *
      * If surf is null, this removes any previously set override, and makes the
      * context current again against its primary surface.
      */
-    virtual void SetEGLSurfaceOverride(void* surf) {
+    virtual void SetEGLSurfaceOverride(EGLSurface surf) {
         MOZ_CRASH("Must be called against a GLContextEGL.");
     }
 
     bool CanUploadSubTextures();
     bool CanReadSRGBFromFBOTexture();
 
     static void PlatformStartup();
 
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -426,17 +426,17 @@ public:
     }
 
     void DestroyEGLImage(EGLImage image) MOZ_OVERRIDE
     {
         sEGLLibrary.fDestroyImage(EGL_DISPLAY(), image);
     }
 #endif
 
-    virtual void SetEGLSurfaceOverride(void* surf) MOZ_OVERRIDE {
+    virtual void SetEGLSurfaceOverride(EGLSurface surf) MOZ_OVERRIDE {
         if (Screen()) {
             /* Blit `draw` to `read` if we need to, before we potentially juggle
              * `read` around. If we don't, we might attach a different `read`,
              * and *then* hit AssureBlitted, which will blit a dirty `draw` onto
              * the wrong `read`!
              */
             Screen()->AssureBlitted();
         }