Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp

Issue 216313006: Change if/else to if in two GrGLInterface factories (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp ('K') | « src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
diff --git a/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp b/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
index c3951777e0f9ade28e3619f3dfec433efdcb3913..e46309b4487ab003d5cb09ff2c2ebc523750459c 100644
--- a/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
+++ b/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
@@ -21,266 +21,265 @@
glXGetProcAddress(reinterpret_cast<const GLubyte*>("gl" #F #S));
const GrGLInterface* GrGLCreateNativeInterface() {
- if (NULL != glXGetCurrentContext()) {
+ if (NULL == glXGetCurrentContext()) {
+ return NULL;
+ }
- const char* versionString = (const char*) glGetString(GL_VERSION);
- GrGLVersion glVer = GrGLGetVersionFromString(versionString);
+ const char* versionString = (const char*) glGetString(GL_VERSION);
+ GrGLVersion glVer = GrGLGetVersionFromString(versionString);
- // This may or may not succeed depending on the gl version.
- GrGLGetStringiProc glGetStringi =
- (GrGLGetStringiProc) glXGetProcAddress(reinterpret_cast<const GLubyte*>("glGetStringi"));
+ // This may or may not succeed depending on the gl version.
+ GrGLGetStringiProc glGetStringi =
+ (GrGLGetStringiProc) glXGetProcAddress(reinterpret_cast<const GLubyte*>("glGetStringi"));
- GrGLExtensions extensions;
- if (!extensions.init(kGL_GrGLStandard, glGetString, glGetStringi, glGetIntegerv)) {
- return NULL;
- }
+ GrGLExtensions extensions;
+ if (!extensions.init(kGL_GrGLStandard, glGetString, glGetStringi, glGetIntegerv)) {
+ return NULL;
+ }
- if (glVer < GR_GL_VER(1,5)) {
- // We must have array and element_array buffer objects.
- return NULL;
- }
+ if (glVer < GR_GL_VER(1,5)) {
+ // We must have array and element_array buffer objects.
+ return NULL;
+ }
- GrGLInterface* interface = SkNEW(GrGLInterface());
- GrGLInterface::Functions* functions = &interface->fFunctions;
+ GrGLInterface* interface = SkNEW(GrGLInterface());
+ GrGLInterface::Functions* functions = &interface->fFunctions;
- functions->fActiveTexture = glActiveTexture;
- GR_GL_GET_PROC(AttachShader);
- GR_GL_GET_PROC(BindAttribLocation);
- GR_GL_GET_PROC(BindBuffer);
- GR_GL_GET_PROC(BindFragDataLocation);
- GR_GL_GET_PROC(BeginQuery);
- functions->fBindTexture = glBindTexture;
- functions->fBlendFunc = glBlendFunc;
+ functions->fActiveTexture = glActiveTexture;
+ GR_GL_GET_PROC(AttachShader);
+ GR_GL_GET_PROC(BindAttribLocation);
+ GR_GL_GET_PROC(BindBuffer);
+ GR_GL_GET_PROC(BindFragDataLocation);
+ GR_GL_GET_PROC(BeginQuery);
+ functions->fBindTexture = glBindTexture;
+ functions->fBlendFunc = glBlendFunc;
- if (glVer >= GR_GL_VER(1,4) ||
- extensions.has("GL_ARB_imaging") ||
- extensions.has("GL_EXT_blend_color")) {
- GR_GL_GET_PROC(BlendColor);
- }
+ if (glVer >= GR_GL_VER(1,4) ||
+ extensions.has("GL_ARB_imaging") ||
+ extensions.has("GL_EXT_blend_color")) {
+ GR_GL_GET_PROC(BlendColor);
+ }
- GR_GL_GET_PROC(BufferData);
- GR_GL_GET_PROC(BufferSubData);
- functions->fClear = glClear;
- functions->fClearColor = glClearColor;
- functions->fClearStencil = glClearStencil;
- functions->fColorMask = glColorMask;
- GR_GL_GET_PROC(CompileShader);
- functions->fCompressedTexImage2D = glCompressedTexImage2D;
- functions->fCopyTexSubImage2D = glCopyTexSubImage2D;
- GR_GL_GET_PROC(CreateProgram);
- GR_GL_GET_PROC(CreateShader);
- functions->fCullFace = glCullFace;
- GR_GL_GET_PROC(DeleteBuffers);
- GR_GL_GET_PROC(DeleteProgram);
- GR_GL_GET_PROC(DeleteQueries);
- GR_GL_GET_PROC(DeleteShader);
- functions->fDeleteTextures = glDeleteTextures;
- functions->fDepthMask = glDepthMask;
- functions->fDisable = glDisable;
- GR_GL_GET_PROC(DisableVertexAttribArray);
- functions->fDrawArrays = glDrawArrays;
- functions->fDrawBuffer = glDrawBuffer;
- GR_GL_GET_PROC(DrawBuffers);
- functions->fDrawElements = glDrawElements;
- functions->fEnable = glEnable;
- GR_GL_GET_PROC(EnableVertexAttribArray);
- GR_GL_GET_PROC(EndQuery);
- functions->fFinish = glFinish;
- functions->fFlush = glFlush;
- functions->fFrontFace = glFrontFace;
- GR_GL_GET_PROC(GenBuffers);
- GR_GL_GET_PROC(GenerateMipmap);
- GR_GL_GET_PROC(GetBufferParameteriv);
- functions->fGetError = glGetError;
- functions->fGetIntegerv = glGetIntegerv;
- GR_GL_GET_PROC(GetQueryObjectiv);
- GR_GL_GET_PROC(GetQueryObjectuiv);
- if (glVer >= GR_GL_VER(3,3) || extensions.has("GL_ARB_timer_query")) {
- GR_GL_GET_PROC(GetQueryObjecti64v);
- GR_GL_GET_PROC(GetQueryObjectui64v);
- GR_GL_GET_PROC(QueryCounter);
- } else if (extensions.has("GL_EXT_timer_query")) {
- GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, EXT);
- GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, EXT);
- }
- GR_GL_GET_PROC(GetQueryiv);
- GR_GL_GET_PROC(GetProgramInfoLog);
- GR_GL_GET_PROC(GetProgramiv);
- GR_GL_GET_PROC(GetShaderInfoLog);
- GR_GL_GET_PROC(GetShaderiv);
- functions->fGetString = glGetString;
- GR_GL_GET_PROC(GetStringi);
- functions->fGetTexLevelParameteriv = glGetTexLevelParameteriv;
- GR_GL_GET_PROC(GenQueries);
- functions->fGenTextures = glGenTextures;
- GR_GL_GET_PROC(GetUniformLocation);
- functions->fLineWidth = glLineWidth;
- GR_GL_GET_PROC(LinkProgram);
- GR_GL_GET_PROC(MapBuffer);
- functions->fPixelStorei = glPixelStorei;
- functions->fReadBuffer = glReadBuffer;
- functions->fReadPixels = glReadPixels;
- functions->fScissor = glScissor;
- GR_GL_GET_PROC(ShaderSource);
- functions->fStencilFunc = glStencilFunc;
- GR_GL_GET_PROC(StencilFuncSeparate);
- functions->fStencilMask = glStencilMask;
- GR_GL_GET_PROC(StencilMaskSeparate);
- functions->fStencilOp = glStencilOp;
- GR_GL_GET_PROC(StencilOpSeparate);
- functions->fTexImage2D = glTexImage2D;
- functions->fTexGenfv = glTexGenfv;
- functions->fTexGeni = glTexGeni;
- functions->fTexParameteri = glTexParameteri;
- functions->fTexParameteriv = glTexParameteriv;
- if (glVer >= GR_GL_VER(4,2) || extensions.has("GL_ARB_texture_storage")) {
- GR_GL_GET_PROC(TexStorage2D);
- } else if (extensions.has("GL_EXT_texture_storage")) {
- GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
- }
- functions->fTexSubImage2D = glTexSubImage2D;
- GR_GL_GET_PROC(Uniform1f);
- GR_GL_GET_PROC(Uniform1i);
- GR_GL_GET_PROC(Uniform1fv);
- GR_GL_GET_PROC(Uniform1iv);
- GR_GL_GET_PROC(Uniform2f);
- GR_GL_GET_PROC(Uniform2i);
- GR_GL_GET_PROC(Uniform2fv);
- GR_GL_GET_PROC(Uniform2iv);
- GR_GL_GET_PROC(Uniform3f);
- GR_GL_GET_PROC(Uniform3i);
- GR_GL_GET_PROC(Uniform3fv);
- GR_GL_GET_PROC(Uniform3iv);
- GR_GL_GET_PROC(Uniform4f);
- GR_GL_GET_PROC(Uniform4i);
- GR_GL_GET_PROC(Uniform4fv);
- GR_GL_GET_PROC(Uniform4iv);
- GR_GL_GET_PROC(UniformMatrix2fv);
- GR_GL_GET_PROC(UniformMatrix3fv);
- GR_GL_GET_PROC(UniformMatrix4fv);
- GR_GL_GET_PROC(UnmapBuffer);
- GR_GL_GET_PROC(UseProgram);
- GR_GL_GET_PROC(VertexAttrib4fv);
- GR_GL_GET_PROC(VertexAttribPointer);
- functions->fViewport = glViewport;
- GR_GL_GET_PROC(BindFragDataLocationIndexed);
+ GR_GL_GET_PROC(BufferData);
+ GR_GL_GET_PROC(BufferSubData);
+ functions->fClear = glClear;
+ functions->fClearColor = glClearColor;
+ functions->fClearStencil = glClearStencil;
+ functions->fColorMask = glColorMask;
+ GR_GL_GET_PROC(CompileShader);
+ functions->fCompressedTexImage2D = glCompressedTexImage2D;
+ functions->fCopyTexSubImage2D = glCopyTexSubImage2D;
+ GR_GL_GET_PROC(CreateProgram);
+ GR_GL_GET_PROC(CreateShader);
+ functions->fCullFace = glCullFace;
+ GR_GL_GET_PROC(DeleteBuffers);
+ GR_GL_GET_PROC(DeleteProgram);
+ GR_GL_GET_PROC(DeleteQueries);
+ GR_GL_GET_PROC(DeleteShader);
+ functions->fDeleteTextures = glDeleteTextures;
+ functions->fDepthMask = glDepthMask;
+ functions->fDisable = glDisable;
+ GR_GL_GET_PROC(DisableVertexAttribArray);
+ functions->fDrawArrays = glDrawArrays;
+ functions->fDrawBuffer = glDrawBuffer;
+ GR_GL_GET_PROC(DrawBuffers);
+ functions->fDrawElements = glDrawElements;
+ functions->fEnable = glEnable;
+ GR_GL_GET_PROC(EnableVertexAttribArray);
+ GR_GL_GET_PROC(EndQuery);
+ functions->fFinish = glFinish;
+ functions->fFlush = glFlush;
+ functions->fFrontFace = glFrontFace;
+ GR_GL_GET_PROC(GenBuffers);
+ GR_GL_GET_PROC(GenerateMipmap);
+ GR_GL_GET_PROC(GetBufferParameteriv);
+ functions->fGetError = glGetError;
+ functions->fGetIntegerv = glGetIntegerv;
+ GR_GL_GET_PROC(GetQueryObjectiv);
+ GR_GL_GET_PROC(GetQueryObjectuiv);
+ if (glVer >= GR_GL_VER(3,3) || extensions.has("GL_ARB_timer_query")) {
+ GR_GL_GET_PROC(GetQueryObjecti64v);
+ GR_GL_GET_PROC(GetQueryObjectui64v);
+ GR_GL_GET_PROC(QueryCounter);
+ } else if (extensions.has("GL_EXT_timer_query")) {
+ GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, EXT);
+ GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, EXT);
+ }
+ GR_GL_GET_PROC(GetQueryiv);
+ GR_GL_GET_PROC(GetProgramInfoLog);
+ GR_GL_GET_PROC(GetProgramiv);
+ GR_GL_GET_PROC(GetShaderInfoLog);
+ GR_GL_GET_PROC(GetShaderiv);
+ functions->fGetString = glGetString;
+ GR_GL_GET_PROC(GetStringi);
+ functions->fGetTexLevelParameteriv = glGetTexLevelParameteriv;
+ GR_GL_GET_PROC(GenQueries);
+ functions->fGenTextures = glGenTextures;
+ GR_GL_GET_PROC(GetUniformLocation);
+ functions->fLineWidth = glLineWidth;
+ GR_GL_GET_PROC(LinkProgram);
+ GR_GL_GET_PROC(MapBuffer);
+ functions->fPixelStorei = glPixelStorei;
+ functions->fReadBuffer = glReadBuffer;
+ functions->fReadPixels = glReadPixels;
+ functions->fScissor = glScissor;
+ GR_GL_GET_PROC(ShaderSource);
+ functions->fStencilFunc = glStencilFunc;
+ GR_GL_GET_PROC(StencilFuncSeparate);
+ functions->fStencilMask = glStencilMask;
+ GR_GL_GET_PROC(StencilMaskSeparate);
+ functions->fStencilOp = glStencilOp;
+ GR_GL_GET_PROC(StencilOpSeparate);
+ functions->fTexImage2D = glTexImage2D;
+ functions->fTexGenfv = glTexGenfv;
+ functions->fTexGeni = glTexGeni;
+ functions->fTexParameteri = glTexParameteri;
+ functions->fTexParameteriv = glTexParameteriv;
+ if (glVer >= GR_GL_VER(4,2) || extensions.has("GL_ARB_texture_storage")) {
+ GR_GL_GET_PROC(TexStorage2D);
+ } else if (extensions.has("GL_EXT_texture_storage")) {
+ GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
+ }
+ functions->fTexSubImage2D = glTexSubImage2D;
+ GR_GL_GET_PROC(Uniform1f);
+ GR_GL_GET_PROC(Uniform1i);
+ GR_GL_GET_PROC(Uniform1fv);
+ GR_GL_GET_PROC(Uniform1iv);
+ GR_GL_GET_PROC(Uniform2f);
+ GR_GL_GET_PROC(Uniform2i);
+ GR_GL_GET_PROC(Uniform2fv);
+ GR_GL_GET_PROC(Uniform2iv);
+ GR_GL_GET_PROC(Uniform3f);
+ GR_GL_GET_PROC(Uniform3i);
+ GR_GL_GET_PROC(Uniform3fv);
+ GR_GL_GET_PROC(Uniform3iv);
+ GR_GL_GET_PROC(Uniform4f);
+ GR_GL_GET_PROC(Uniform4i);
+ GR_GL_GET_PROC(Uniform4fv);
+ GR_GL_GET_PROC(Uniform4iv);
+ GR_GL_GET_PROC(UniformMatrix2fv);
+ GR_GL_GET_PROC(UniformMatrix3fv);
+ GR_GL_GET_PROC(UniformMatrix4fv);
+ GR_GL_GET_PROC(UnmapBuffer);
+ GR_GL_GET_PROC(UseProgram);
+ GR_GL_GET_PROC(VertexAttrib4fv);
+ GR_GL_GET_PROC(VertexAttribPointer);
+ functions->fViewport = glViewport;
+ GR_GL_GET_PROC(BindFragDataLocationIndexed);
- if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) {
- // no ARB suffix for GL_ARB_vertex_array_object
- GR_GL_GET_PROC(BindVertexArray);
- GR_GL_GET_PROC(GenVertexArrays);
- GR_GL_GET_PROC(DeleteVertexArrays);
- }
+ if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) {
+ // no ARB suffix for GL_ARB_vertex_array_object
+ GR_GL_GET_PROC(BindVertexArray);
+ GR_GL_GET_PROC(GenVertexArrays);
+ GR_GL_GET_PROC(DeleteVertexArrays);
+ }
- // First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
- // GL_ARB_framebuffer_object doesn't use ARB suffix.)
- if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_framebuffer_object")) {
- GR_GL_GET_PROC(GenFramebuffers);
- GR_GL_GET_PROC(GetFramebufferAttachmentParameteriv);
- GR_GL_GET_PROC(GetRenderbufferParameteriv);
- GR_GL_GET_PROC(BindFramebuffer);
- GR_GL_GET_PROC(FramebufferTexture2D);
- GR_GL_GET_PROC(CheckFramebufferStatus);
- GR_GL_GET_PROC(DeleteFramebuffers);
- GR_GL_GET_PROC(RenderbufferStorage);
- GR_GL_GET_PROC(GenRenderbuffers);
- GR_GL_GET_PROC(DeleteRenderbuffers);
- GR_GL_GET_PROC(FramebufferRenderbuffer);
- GR_GL_GET_PROC(BindRenderbuffer);
- GR_GL_GET_PROC(RenderbufferStorageMultisample);
- GR_GL_GET_PROC(BlitFramebuffer);
- } else if (extensions.has("GL_EXT_framebuffer_object")) {
- GR_GL_GET_PROC_SUFFIX(GenFramebuffers, EXT);
- GR_GL_GET_PROC_SUFFIX(GetFramebufferAttachmentParameteriv, EXT);
- GR_GL_GET_PROC_SUFFIX(GetRenderbufferParameteriv, EXT);
- GR_GL_GET_PROC_SUFFIX(BindFramebuffer, EXT);
- GR_GL_GET_PROC_SUFFIX(FramebufferTexture2D, EXT);
- GR_GL_GET_PROC_SUFFIX(CheckFramebufferStatus, EXT);
- GR_GL_GET_PROC_SUFFIX(DeleteFramebuffers, EXT);
- GR_GL_GET_PROC_SUFFIX(RenderbufferStorage, EXT);
- GR_GL_GET_PROC_SUFFIX(GenRenderbuffers, EXT);
- GR_GL_GET_PROC_SUFFIX(DeleteRenderbuffers, EXT);
- GR_GL_GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT);
- GR_GL_GET_PROC_SUFFIX(BindRenderbuffer, EXT);
- if (extensions.has("GL_EXT_framebuffer_multisample")) {
- GR_GL_GET_PROC_SUFFIX(RenderbufferStorageMultisample, EXT);
- }
- if (extensions.has("GL_EXT_framebuffer_blit")) {
- GR_GL_GET_PROC_SUFFIX(BlitFramebuffer, EXT);
- }
- } else {
- // we must have FBOs
- delete interface;
- return NULL;
+ // First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
+ // GL_ARB_framebuffer_object doesn't use ARB suffix.)
+ if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_framebuffer_object")) {
+ GR_GL_GET_PROC(GenFramebuffers);
+ GR_GL_GET_PROC(GetFramebufferAttachmentParameteriv);
+ GR_GL_GET_PROC(GetRenderbufferParameteriv);
+ GR_GL_GET_PROC(BindFramebuffer);
+ GR_GL_GET_PROC(FramebufferTexture2D);
+ GR_GL_GET_PROC(CheckFramebufferStatus);
+ GR_GL_GET_PROC(DeleteFramebuffers);
+ GR_GL_GET_PROC(RenderbufferStorage);
+ GR_GL_GET_PROC(GenRenderbuffers);
+ GR_GL_GET_PROC(DeleteRenderbuffers);
+ GR_GL_GET_PROC(FramebufferRenderbuffer);
+ GR_GL_GET_PROC(BindRenderbuffer);
+ GR_GL_GET_PROC(RenderbufferStorageMultisample);
+ GR_GL_GET_PROC(BlitFramebuffer);
+ } else if (extensions.has("GL_EXT_framebuffer_object")) {
+ GR_GL_GET_PROC_SUFFIX(GenFramebuffers, EXT);
+ GR_GL_GET_PROC_SUFFIX(GetFramebufferAttachmentParameteriv, EXT);
+ GR_GL_GET_PROC_SUFFIX(GetRenderbufferParameteriv, EXT);
+ GR_GL_GET_PROC_SUFFIX(BindFramebuffer, EXT);
+ GR_GL_GET_PROC_SUFFIX(FramebufferTexture2D, EXT);
+ GR_GL_GET_PROC_SUFFIX(CheckFramebufferStatus, EXT);
+ GR_GL_GET_PROC_SUFFIX(DeleteFramebuffers, EXT);
+ GR_GL_GET_PROC_SUFFIX(RenderbufferStorage, EXT);
+ GR_GL_GET_PROC_SUFFIX(GenRenderbuffers, EXT);
+ GR_GL_GET_PROC_SUFFIX(DeleteRenderbuffers, EXT);
+ GR_GL_GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT);
+ GR_GL_GET_PROC_SUFFIX(BindRenderbuffer, EXT);
+ if (extensions.has("GL_EXT_framebuffer_multisample")) {
+ GR_GL_GET_PROC_SUFFIX(RenderbufferStorageMultisample, EXT);
}
-
- GR_GL_GET_PROC(LoadIdentity);
- GR_GL_GET_PROC(LoadMatrixf);
- GR_GL_GET_PROC(MatrixMode);
-
- if (extensions.has("GL_NV_path_rendering")) {
- GR_GL_GET_PROC_SUFFIX(PathCommands, NV);
- GR_GL_GET_PROC_SUFFIX(PathCoords, NV);
- GR_GL_GET_PROC_SUFFIX(PathSubCommands, NV);
- GR_GL_GET_PROC_SUFFIX(PathSubCoords, NV);
- GR_GL_GET_PROC_SUFFIX(PathString, NV);
- GR_GL_GET_PROC_SUFFIX(PathGlyphs, NV);
- GR_GL_GET_PROC_SUFFIX(PathGlyphRange, NV);
- GR_GL_GET_PROC_SUFFIX(WeightPaths, NV);
- GR_GL_GET_PROC_SUFFIX(CopyPath, NV);
- GR_GL_GET_PROC_SUFFIX(InterpolatePaths, NV);
- GR_GL_GET_PROC_SUFFIX(TransformPath, NV);
- GR_GL_GET_PROC_SUFFIX(PathParameteriv, NV);
- GR_GL_GET_PROC_SUFFIX(PathParameteri, NV);
- GR_GL_GET_PROC_SUFFIX(PathParameterfv, NV);
- GR_GL_GET_PROC_SUFFIX(PathParameterf, NV);
- GR_GL_GET_PROC_SUFFIX(PathDashArray, NV);
- GR_GL_GET_PROC_SUFFIX(GenPaths, NV);
- GR_GL_GET_PROC_SUFFIX(DeletePaths, NV);
- GR_GL_GET_PROC_SUFFIX(IsPath, NV);
- GR_GL_GET_PROC_SUFFIX(PathStencilFunc, NV);
- GR_GL_GET_PROC_SUFFIX(PathStencilDepthOffset, NV);
- GR_GL_GET_PROC_SUFFIX(StencilFillPath, NV);
- GR_GL_GET_PROC_SUFFIX(StencilStrokePath, NV);
- GR_GL_GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
- GR_GL_GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
- GR_GL_GET_PROC_SUFFIX(PathCoverDepthFunc, NV);
- GR_GL_GET_PROC_SUFFIX(PathColorGen, NV);
- GR_GL_GET_PROC_SUFFIX(PathTexGen, NV);
- GR_GL_GET_PROC_SUFFIX(PathFogGen, NV);
- GR_GL_GET_PROC_SUFFIX(CoverFillPath, NV);
- GR_GL_GET_PROC_SUFFIX(CoverStrokePath, NV);
- GR_GL_GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
- GR_GL_GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathParameteriv, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathParameterfv, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathCommands, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathCoords, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathDashArray, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathMetrics, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathMetricRange, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathSpacing, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathColorGeniv, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV);
- GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV);
- GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV);
- GR_GL_GET_PROC_SUFFIX(GetPathLength, NV);
- GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV);
+ if (extensions.has("GL_EXT_framebuffer_blit")) {
+ GR_GL_GET_PROC_SUFFIX(BlitFramebuffer, EXT);
}
+ } else {
+ // we must have FBOs
+ delete interface;
+ return NULL;
+ }
- if (extensions.has("GL_EXT_debug_marker")) {
- GR_GL_GET_PROC_SUFFIX(InsertEventMarker, EXT);
- GR_GL_GET_PROC_SUFFIX(PushGroupMarker, EXT);
- GR_GL_GET_PROC_SUFFIX(PopGroupMarker, EXT);
- }
+ GR_GL_GET_PROC(LoadIdentity);
+ GR_GL_GET_PROC(LoadMatrixf);
+ GR_GL_GET_PROC(MatrixMode);
- interface->fStandard = kGL_GrGLStandard;
- interface->fExtensions.swap(&extensions);
+ if (extensions.has("GL_NV_path_rendering")) {
+ GR_GL_GET_PROC_SUFFIX(PathCommands, NV);
+ GR_GL_GET_PROC_SUFFIX(PathCoords, NV);
+ GR_GL_GET_PROC_SUFFIX(PathSubCommands, NV);
+ GR_GL_GET_PROC_SUFFIX(PathSubCoords, NV);
+ GR_GL_GET_PROC_SUFFIX(PathString, NV);
+ GR_GL_GET_PROC_SUFFIX(PathGlyphs, NV);
+ GR_GL_GET_PROC_SUFFIX(PathGlyphRange, NV);
+ GR_GL_GET_PROC_SUFFIX(WeightPaths, NV);
+ GR_GL_GET_PROC_SUFFIX(CopyPath, NV);
+ GR_GL_GET_PROC_SUFFIX(InterpolatePaths, NV);
+ GR_GL_GET_PROC_SUFFIX(TransformPath, NV);
+ GR_GL_GET_PROC_SUFFIX(PathParameteriv, NV);
+ GR_GL_GET_PROC_SUFFIX(PathParameteri, NV);
+ GR_GL_GET_PROC_SUFFIX(PathParameterfv, NV);
+ GR_GL_GET_PROC_SUFFIX(PathParameterf, NV);
+ GR_GL_GET_PROC_SUFFIX(PathDashArray, NV);
+ GR_GL_GET_PROC_SUFFIX(GenPaths, NV);
+ GR_GL_GET_PROC_SUFFIX(DeletePaths, NV);
+ GR_GL_GET_PROC_SUFFIX(IsPath, NV);
+ GR_GL_GET_PROC_SUFFIX(PathStencilFunc, NV);
+ GR_GL_GET_PROC_SUFFIX(PathStencilDepthOffset, NV);
+ GR_GL_GET_PROC_SUFFIX(StencilFillPath, NV);
+ GR_GL_GET_PROC_SUFFIX(StencilStrokePath, NV);
+ GR_GL_GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
+ GR_GL_GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
+ GR_GL_GET_PROC_SUFFIX(PathCoverDepthFunc, NV);
+ GR_GL_GET_PROC_SUFFIX(PathColorGen, NV);
+ GR_GL_GET_PROC_SUFFIX(PathTexGen, NV);
+ GR_GL_GET_PROC_SUFFIX(PathFogGen, NV);
+ GR_GL_GET_PROC_SUFFIX(CoverFillPath, NV);
+ GR_GL_GET_PROC_SUFFIX(CoverStrokePath, NV);
+ GR_GL_GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
+ GR_GL_GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathParameteriv, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathParameterfv, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathCommands, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathCoords, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathDashArray, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathMetrics, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathMetricRange, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathSpacing, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathColorGeniv, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV);
+ GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV);
+ GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV);
+ GR_GL_GET_PROC_SUFFIX(GetPathLength, NV);
+ GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV);
+ }
- return interface;
- } else {
- return NULL;
+ if (extensions.has("GL_EXT_debug_marker")) {
+ GR_GL_GET_PROC_SUFFIX(InsertEventMarker, EXT);
+ GR_GL_GET_PROC_SUFFIX(PushGroupMarker, EXT);
+ GR_GL_GET_PROC_SUFFIX(PopGroupMarker, EXT);
}
+
+ interface->fStandard = kGL_GrGLStandard;
+ interface->fExtensions.swap(&extensions);
+
+ return interface;
}
« src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp ('K') | « src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698