Bug 1340627 - part 5 - fix SkiaGL glue for Skia m59. r=mchang

MozReview-Commit-ID: LelzAgAdWb7

gfx/gl/GLContext.cpp

@@ -594,6 +594,7 @@ GLContext::InitWithPrefixImpl(const char* prefix, bool trygl)
             { (PRFuncPtr*) &mSymbols.fLoadIdentity, { "LoadIdentity", nullptr } },
             { (PRFuncPtr*) &mSymbols.fLoadMatrixf, { "LoadMatrixf", nullptr } },
             { (PRFuncPtr*) &mSymbols.fMatrixMode, { "MatrixMode", nullptr } },
+            { (PRFuncPtr*) &mSymbols.fPolygonMode, { "PolygonMode", nullptr } },
             { (PRFuncPtr*) &mSymbols.fTexGeni, { "TexGeni", nullptr } },
             { (PRFuncPtr*) &mSymbols.fTexGenf, { "TexGenf", nullptr } },
             { (PRFuncPtr*) &mSymbols.fTexGenfv, { "TexGenfv", nullptr } },

gfx/gl/GLContext.h

@@ -1459,6 +1459,12 @@ public:
         AFTER_GL_CALL;
     }
 
+    void fPolygonMode(GLenum face, GLenum mode) {
+        BEFORE_GL_CALL;
+        mSymbols.fPolygonMode(face, mode);
+        AFTER_GL_CALL;
+    }
+
     void fPolygonOffset(GLfloat factor, GLfloat bias) {
         BEFORE_GL_CALL;
         mSymbols.fPolygonOffset(factor, bias);

gfx/gl/GLContextSymbols.h

@@ -203,6 +203,8 @@ struct GLContextSymbols
     PFNGLPIXELSTOREIPROC fPixelStorei;
     typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
     PFNGLPOINTPARAMETERFPROC fPointParameterf;
+    typedef void (GLAPIENTRY * PFNGLPOLYGONMODEPROC) (GLenum face, GLenum mode);
+    PFNGLPOLYGONMODEPROC fPolygonMode;
     typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat bias);
     PFNGLPOLYGONOFFSETPROC fPolygonOffset;
     typedef void (GLAPIENTRY * PFNGLREADBUFFERPROC) (GLenum);

gfx/gl/SkiaGLGlue.cpp

@@ -221,6 +221,7 @@ static GrGLInterface* CreateGrGLInterfaceFromGLContext(GLContext* context)
     i->fFunctions.fLineWidth = WrapGL(context, &GLContext::fLineWidth);
     i->fFunctions.fLinkProgram = WrapGL(context, &GLContext::fLinkProgram);
     i->fFunctions.fPixelStorei = WrapGL(context, &GLContext::fPixelStorei);
+    i->fFunctions.fPolygonMode = WrapGL(context, &GLContext::fPolygonMode);
     i->fFunctions.fReadPixels = WrapGL(context, &GLContext::fReadPixels);
     i->fFunctions.fRenderbufferStorage = WrapGL(context, &GLContext::fRenderbufferStorage);
     i->fFunctions.fScissor = WrapGL(context, &GLContext::fScissor);