Index: include/gpu/gl/GrGLInterface.h |
diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h |
index 2190c018b03674809eea50ebbbe708afe7f05c3f..3d34ae65bf25917cc9e70d95cb4a15bc53e11125 100644 |
--- a/include/gpu/gl/GrGLInterface.h |
+++ b/include/gpu/gl/GrGLInterface.h |
@@ -138,18 +138,7 @@ public: |
GrGLExtensions fExtensions; |
- // This wrapper and const hackery is necessary because the factories in Chromium do not yet |
- // initialize fExtensions. |
- bool hasExtension(const char ext[]) const { |
- if (!fExtensions.isInitialized()) { |
- GrGLExtensions* extensions = const_cast<GrGLExtensions*>(&fExtensions); |
- if (!extensions->init(fStandard, fFunctions.fGetString, |
- fFunctions.fGetStringi, fFunctions.fGetIntegerv)) { |
- return false; |
- } |
- } |
- return fExtensions.has(ext); |
- } |
+ bool hasExtension(const char ext[]) const { return fExtensions.has(ext); } |
/** |
* The function pointers are in a struct so that we can have a compiler generated assignment |
@@ -369,199 +358,11 @@ public: |
GLPtr<GrGLPointAlongPathProc> fPointAlongPath; |
} fFunctions; |
- // Temporary workaround aliases to keep Chromium GrGLInterface factories compiling until they |
- // assign the members of fFunctions. |
- GLPtrAlias<GrGLActiveTextureProc> fActiveTexture; |
- GLPtrAlias<GrGLAttachShaderProc> fAttachShader; |
- GLPtrAlias<GrGLBeginQueryProc> fBeginQuery; |
- GLPtrAlias<GrGLBindAttribLocationProc> fBindAttribLocation; |
- GLPtrAlias<GrGLBindBufferProc> fBindBuffer; |
- GLPtrAlias<GrGLBindFragDataLocationProc> fBindFragDataLocation; |
- GLPtrAlias<GrGLBindFragDataLocationIndexedProc> fBindFragDataLocationIndexed; |
- GLPtrAlias<GrGLBindFramebufferProc> fBindFramebuffer; |
- GLPtrAlias<GrGLBindRenderbufferProc> fBindRenderbuffer; |
- GLPtrAlias<GrGLBindTextureProc> fBindTexture; |
- GLPtrAlias<GrGLBindVertexArrayProc> fBindVertexArray; |
- GLPtrAlias<GrGLBlendColorProc> fBlendColor; |
- GLPtrAlias<GrGLBlendFuncProc> fBlendFunc; |
- GLPtrAlias<GrGLBlitFramebufferProc> fBlitFramebuffer; |
- GLPtrAlias<GrGLBufferDataProc> fBufferData; |
- GLPtrAlias<GrGLBufferSubDataProc> fBufferSubData; |
- GLPtrAlias<GrGLCheckFramebufferStatusProc> fCheckFramebufferStatus; |
- GLPtrAlias<GrGLClearProc> fClear; |
- GLPtrAlias<GrGLClearColorProc> fClearColor; |
- GLPtrAlias<GrGLClearStencilProc> fClearStencil; |
- GLPtrAlias<GrGLColorMaskProc> fColorMask; |
- GLPtrAlias<GrGLCompileShaderProc> fCompileShader; |
- GLPtrAlias<GrGLCompressedTexImage2DProc> fCompressedTexImage2D; |
- GLPtrAlias<GrGLCopyTexSubImage2DProc> fCopyTexSubImage2D; |
- GLPtrAlias<GrGLCreateProgramProc> fCreateProgram; |
- GLPtrAlias<GrGLCreateShaderProc> fCreateShader; |
- GLPtrAlias<GrGLCullFaceProc> fCullFace; |
- GLPtrAlias<GrGLDeleteBuffersProc> fDeleteBuffers; |
- GLPtrAlias<GrGLDeleteFramebuffersProc> fDeleteFramebuffers; |
- GLPtrAlias<GrGLDeleteProgramProc> fDeleteProgram; |
- GLPtrAlias<GrGLDeleteQueriesProc> fDeleteQueries; |
- GLPtrAlias<GrGLDeleteRenderbuffersProc> fDeleteRenderbuffers; |
- GLPtrAlias<GrGLDeleteShaderProc> fDeleteShader; |
- GLPtrAlias<GrGLDeleteTexturesProc> fDeleteTextures; |
- GLPtrAlias<GrGLDeleteVertexArraysProc> fDeleteVertexArrays; |
- GLPtrAlias<GrGLDepthMaskProc> fDepthMask; |
- GLPtrAlias<GrGLDisableProc> fDisable; |
- GLPtrAlias<GrGLDisableVertexAttribArrayProc> fDisableVertexAttribArray; |
- GLPtrAlias<GrGLDrawArraysProc> fDrawArrays; |
- GLPtrAlias<GrGLDrawBufferProc> fDrawBuffer; |
- GLPtrAlias<GrGLDrawBuffersProc> fDrawBuffers; |
- GLPtrAlias<GrGLDrawElementsProc> fDrawElements; |
- GLPtrAlias<GrGLEnableProc> fEnable; |
- GLPtrAlias<GrGLEnableVertexAttribArrayProc> fEnableVertexAttribArray; |
- GLPtrAlias<GrGLEndQueryProc> fEndQuery; |
- GLPtrAlias<GrGLFinishProc> fFinish; |
- GLPtrAlias<GrGLFlushProc> fFlush; |
- GLPtrAlias<GrGLFramebufferRenderbufferProc> fFramebufferRenderbuffer; |
- GLPtrAlias<GrGLFramebufferTexture2DProc> fFramebufferTexture2D; |
- GLPtrAlias<GrGLFramebufferTexture2DMultisampleProc> fFramebufferTexture2DMultisample; |
- GLPtrAlias<GrGLFrontFaceProc> fFrontFace; |
- GLPtrAlias<GrGLGenBuffersProc> fGenBuffers; |
- GLPtrAlias<GrGLGenFramebuffersProc> fGenFramebuffers; |
- GLPtrAlias<GrGLGenerateMipmapProc> fGenerateMipmap; |
- GLPtrAlias<GrGLGenQueriesProc> fGenQueries; |
- GLPtrAlias<GrGLGenRenderbuffersProc> fGenRenderbuffers; |
- GLPtrAlias<GrGLGenTexturesProc> fGenTextures; |
- GLPtrAlias<GrGLGenVertexArraysProc> fGenVertexArrays; |
- GLPtrAlias<GrGLGetBufferParameterivProc> fGetBufferParameteriv; |
- GLPtrAlias<GrGLGetErrorProc> fGetError; |
- GLPtrAlias<GrGLGetFramebufferAttachmentParameterivProc> fGetFramebufferAttachmentParameteriv; |
- GLPtrAlias<GrGLGetIntegervProc> fGetIntegerv; |
- GLPtrAlias<GrGLGetQueryObjecti64vProc> fGetQueryObjecti64v; |
- GLPtrAlias<GrGLGetQueryObjectivProc> fGetQueryObjectiv; |
- GLPtrAlias<GrGLGetQueryObjectui64vProc> fGetQueryObjectui64v; |
- GLPtrAlias<GrGLGetQueryObjectuivProc> fGetQueryObjectuiv; |
- GLPtrAlias<GrGLGetQueryivProc> fGetQueryiv; |
- GLPtrAlias<GrGLGetProgramInfoLogProc> fGetProgramInfoLog; |
- GLPtrAlias<GrGLGetProgramivProc> fGetProgramiv; |
- GLPtrAlias<GrGLGetRenderbufferParameterivProc> fGetRenderbufferParameteriv; |
- GLPtrAlias<GrGLGetShaderInfoLogProc> fGetShaderInfoLog; |
- GLPtrAlias<GrGLGetShaderivProc> fGetShaderiv; |
- GLPtrAlias<GrGLGetStringProc> fGetString; |
- GLPtrAlias<GrGLGetStringiProc> fGetStringi; |
- GLPtrAlias<GrGLGetTexLevelParameterivProc> fGetTexLevelParameteriv; |
- GLPtrAlias<GrGLGetUniformLocationProc> fGetUniformLocation; |
- GLPtrAlias<GrGLInsertEventMarkerProc> fInsertEventMarker; |
- GLPtrAlias<GrGLLineWidthProc> fLineWidth; |
- GLPtrAlias<GrGLLinkProgramProc> fLinkProgram; |
- GLPtrAlias<GrGLLoadIdentityProc> fLoadIdentity; |
- GLPtrAlias<GrGLLoadMatrixfProc> fLoadMatrixf; |
- GLPtrAlias<GrGLMapBufferProc> fMapBuffer; |
- GLPtrAlias<GrGLMatrixModeProc> fMatrixMode; |
- GLPtrAlias<GrGLPixelStoreiProc> fPixelStorei; |
- GLPtrAlias<GrGLPopGroupMarkerProc> fPopGroupMarker; |
- GLPtrAlias<GrGLPushGroupMarkerProc> fPushGroupMarker; |
- GLPtrAlias<GrGLQueryCounterProc> fQueryCounter; |
- GLPtrAlias<GrGLReadBufferProc> fReadBuffer; |
- GLPtrAlias<GrGLReadPixelsProc> fReadPixels; |
- GLPtrAlias<GrGLRenderbufferStorageProc> fRenderbufferStorage; |
- GLPtrAlias<GrGLRenderbufferStorageMultisampleProc> fRenderbufferStorageMultisampleES2EXT; |
- GLPtrAlias<GrGLRenderbufferStorageMultisampleProc> fRenderbufferStorageMultisampleES2APPLE; |
- GLPtrAlias<GrGLRenderbufferStorageMultisampleProc> fRenderbufferStorageMultisample; |
- GLPtrAlias<GrGLBindUniformLocation> fBindUniformLocation; |
- GLPtrAlias<GrGLResolveMultisampleFramebufferProc> fResolveMultisampleFramebuffer; |
- GLPtrAlias<GrGLScissorProc> fScissor; |
- GLPtrAlias<GrGLShaderSourceProc> fShaderSource; |
- GLPtrAlias<GrGLStencilFuncProc> fStencilFunc; |
- GLPtrAlias<GrGLStencilFuncSeparateProc> fStencilFuncSeparate; |
- GLPtrAlias<GrGLStencilMaskProc> fStencilMask; |
- GLPtrAlias<GrGLStencilMaskSeparateProc> fStencilMaskSeparate; |
- GLPtrAlias<GrGLStencilOpProc> fStencilOp; |
- GLPtrAlias<GrGLStencilOpSeparateProc> fStencilOpSeparate; |
- GLPtrAlias<GrGLTexGenfvProc> fTexGenfv; |
- GLPtrAlias<GrGLTexGeniProc> fTexGeni; |
- GLPtrAlias<GrGLTexImage2DProc> fTexImage2D; |
- GLPtrAlias<GrGLTexParameteriProc> fTexParameteri; |
- GLPtrAlias<GrGLTexParameterivProc> fTexParameteriv; |
- GLPtrAlias<GrGLTexSubImage2DProc> fTexSubImage2D; |
- GLPtrAlias<GrGLTexStorage2DProc> fTexStorage2D; |
- GLPtrAlias<GrGLDiscardFramebufferProc> fDiscardFramebuffer; |
- GLPtrAlias<GrGLUniform1fProc> fUniform1f; |
- GLPtrAlias<GrGLUniform1iProc> fUniform1i; |
- GLPtrAlias<GrGLUniform1fvProc> fUniform1fv; |
- GLPtrAlias<GrGLUniform1ivProc> fUniform1iv; |
- GLPtrAlias<GrGLUniform2fProc> fUniform2f; |
- GLPtrAlias<GrGLUniform2iProc> fUniform2i; |
- GLPtrAlias<GrGLUniform2fvProc> fUniform2fv; |
- GLPtrAlias<GrGLUniform2ivProc> fUniform2iv; |
- GLPtrAlias<GrGLUniform3fProc> fUniform3f; |
- GLPtrAlias<GrGLUniform3iProc> fUniform3i; |
- GLPtrAlias<GrGLUniform3fvProc> fUniform3fv; |
- GLPtrAlias<GrGLUniform3ivProc> fUniform3iv; |
- GLPtrAlias<GrGLUniform4fProc> fUniform4f; |
- GLPtrAlias<GrGLUniform4iProc> fUniform4i; |
- GLPtrAlias<GrGLUniform4fvProc> fUniform4fv; |
- GLPtrAlias<GrGLUniform4ivProc> fUniform4iv; |
- GLPtrAlias<GrGLUniformMatrix2fvProc> fUniformMatrix2fv; |
- GLPtrAlias<GrGLUniformMatrix3fvProc> fUniformMatrix3fv; |
- GLPtrAlias<GrGLUniformMatrix4fvProc> fUniformMatrix4fv; |
- GLPtrAlias<GrGLUnmapBufferProc> fUnmapBuffer; |
- GLPtrAlias<GrGLUseProgramProc> fUseProgram; |
- GLPtrAlias<GrGLVertexAttrib4fvProc> fVertexAttrib4fv; |
- GLPtrAlias<GrGLVertexAttribPointerProc> fVertexAttribPointer; |
- GLPtrAlias<GrGLViewportProc> fViewport; |
- GLPtrAlias<GrGLPathCommandsProc> fPathCommands; |
- GLPtrAlias<GrGLPathCoordsProc> fPathCoords; |
- GLPtrAlias<GrGLPathSubCommandsProc> fPathSubCommands; |
- GLPtrAlias<GrGLPathSubCoordsProc> fPathSubCoords; |
- GLPtrAlias<GrGLPathStringProc> fPathString; |
- GLPtrAlias<GrGLPathGlyphsProc> fPathGlyphs; |
- GLPtrAlias<GrGLPathGlyphRangeProc> fPathGlyphRange; |
- GLPtrAlias<GrGLWeightPathsProc> fWeightPaths; |
- GLPtrAlias<GrGLCopyPathProc> fCopyPath; |
- GLPtrAlias<GrGLInterpolatePathsProc> fInterpolatePaths; |
- GLPtrAlias<GrGLTransformPathProc> fTransformPath; |
- GLPtrAlias<GrGLPathParameterivProc> fPathParameteriv; |
- GLPtrAlias<GrGLPathParameteriProc> fPathParameteri; |
- GLPtrAlias<GrGLPathParameterfvProc> fPathParameterfv; |
- GLPtrAlias<GrGLPathParameterfProc> fPathParameterf; |
- GLPtrAlias<GrGLPathDashArrayProc> fPathDashArray; |
- GLPtrAlias<GrGLGenPathsProc> fGenPaths; |
- GLPtrAlias<GrGLDeletePathsProc> fDeletePaths; |
- GLPtrAlias<GrGLIsPathProc> fIsPath; |
- GLPtrAlias<GrGLPathStencilFuncProc> fPathStencilFunc; |
- GLPtrAlias<GrGLPathStencilDepthOffsetProc> fPathStencilDepthOffset; |
- GLPtrAlias<GrGLStencilFillPathProc> fStencilFillPath; |
- GLPtrAlias<GrGLStencilStrokePathProc> fStencilStrokePath; |
- GLPtrAlias<GrGLStencilFillPathInstancedProc> fStencilFillPathInstanced; |
- GLPtrAlias<GrGLStencilStrokePathInstancedProc> fStencilStrokePathInstanced; |
- GLPtrAlias<GrGLPathCoverDepthFuncProc> fPathCoverDepthFunc; |
- GLPtrAlias<GrGLPathColorGenProc> fPathColorGen; |
- GLPtrAlias<GrGLPathTexGenProc> fPathTexGen; |
- GLPtrAlias<GrGLPathFogGenProc> fPathFogGen; |
- GLPtrAlias<GrGLCoverFillPathProc> fCoverFillPath; |
- GLPtrAlias<GrGLCoverStrokePathProc> fCoverStrokePath; |
- GLPtrAlias<GrGLCoverFillPathInstancedProc> fCoverFillPathInstanced; |
- GLPtrAlias<GrGLCoverStrokePathInstancedProc> fCoverStrokePathInstanced; |
- GLPtrAlias<GrGLGetPathParameterivProc> fGetPathParameteriv; |
- GLPtrAlias<GrGLGetPathParameterfvProc> fGetPathParameterfv; |
- GLPtrAlias<GrGLGetPathCommandsProc> fGetPathCommands; |
- GLPtrAlias<GrGLGetPathCoordsProc> fGetPathCoords; |
- GLPtrAlias<GrGLGetPathDashArrayProc> fGetPathDashArray; |
- GLPtrAlias<GrGLGetPathMetricsProc> fGetPathMetrics; |
- GLPtrAlias<GrGLGetPathMetricRangeProc> fGetPathMetricRange; |
- GLPtrAlias<GrGLGetPathSpacingProc> fGetPathSpacing; |
- GLPtrAlias<GrGLGetPathColorGenivProc> fGetPathColorGeniv; |
- GLPtrAlias<GrGLGetPathColorGenfvProc> fGetPathColorGenfv; |
- GLPtrAlias<GrGLGetPathTexGenivProc> fGetPathTexGeniv; |
- GLPtrAlias<GrGLGetPathTexGenfvProc> fGetPathTexGenfv; |
- GLPtrAlias<GrGLIsPointInFillPathProc> fIsPointInFillPath; |
- GLPtrAlias<GrGLIsPointInStrokePathProc> fIsPointInStrokePath; |
- GLPtrAlias<GrGLGetPathLengthProc> fGetPathLength; |
- GLPtrAlias<GrGLPointAlongPathProc> fPointAlongPath; |
- |
// Per-GL func callback |
#if GR_GL_PER_GL_FUNC_CALLBACK |
GrGLInterfaceCallbackProc fCallback; |
GrGLInterfaceCallbackData fCallbackData; |
#endif |
- |
}; |
#endif |