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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp

Issue 254713006: Common GrGLInterface OpenGL setup function. (Closed) Base URL: https://skia.googlesource.com/skia.git@grgl
Patch Set: Address additional comment Created 6 years, 8 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
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
diff --git a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
index 4c3d03fd3756b4e4005b61a4cdec8ccc984787ec..8ae919314c45b6db200dc59df75e3a5d59db62cc 100644
--- a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
+++ b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
@@ -8,12 +8,10 @@
#include "gl/GrGLInterface.h"
-#include "../GrGLUtil.h"
+#include "gl/GrGLAssembleInterface.h"
#include <dlfcn.h>
-// We get the proc addresss of all GL functions dynamically because we sometimes link against
-// alternative GL implementations (e.g. MESA) in addition to the native GL implementation.
class GLLoader {
public:
GLLoader() {
@@ -21,235 +19,40 @@ public:
"/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib",
RTLD_LAZY);
}
+
~GLLoader() {
if (NULL != fLibrary) {
dlclose(fLibrary);
}
}
- void* handle() {
+
+ void* handle() const {
return NULL == fLibrary ? RTLD_DEFAULT : fLibrary;
}
+
private:
void* fLibrary;
};
-static void* GetProcAddress(const char* name) {
- static GLLoader gLoader;
- return dlsym(gLoader.handle(), name);
-}
-
-#define GET_PROC(name) (interface->fFunctions.f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name)))
-#define GET_PROC_SUFFIX(name, suffix) (interface->fFunctions.f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name #suffix)))
-
-const GrGLInterface* GrGLCreateNativeInterface() {
-
- GrGLGetStringProc glGetString = (GrGLGetStringProc) GetProcAddress("glGetString");
- GrGLGetStringiProc glGetStringi = (GrGLGetStringiProc) GetProcAddress("glGetStringi");
- GrGLGetIntegervProc glGetIntegerv = (GrGLGetIntegervProc) GetProcAddress("glGetIntegerv");
-
- const char* verStr = (const char*) glGetString(GR_GL_VERSION);
- GrGLVersion ver = GrGLGetVersionFromString(verStr);
- GrGLExtensions extensions;
- if (!extensions.init(kGL_GrGLStandard, glGetString, glGetStringi, glGetIntegerv)) {
- return NULL;
- }
-
- GrGLInterface* interface = SkNEW(GrGLInterface);
- interface->fStandard = kGL_GrGLStandard;
-
- GET_PROC(ActiveTexture);
- GET_PROC(AttachShader);
- GET_PROC(BeginQuery);
- GET_PROC(BindAttribLocation);
- GET_PROC(BindBuffer);
- if (ver >= GR_GL_VER(3,0)) {
- GET_PROC(BindFragDataLocation);
- }
- GET_PROC(BindTexture);
- GET_PROC(BlendFunc);
-
- if (ver >= GR_GL_VER(1,4) ||
- extensions.has("GL_ARB_imaging") ||
- extensions.has("GL_EXT_blend_color")) {
- GET_PROC(BlendColor);
- }
-
- GET_PROC(BufferData);
- GET_PROC(BufferSubData);
- GET_PROC(Clear);
- GET_PROC(ClearColor);
- GET_PROC(ClearStencil);
- GET_PROC(ColorMask);
- GET_PROC(CompileShader);
- GET_PROC(CompressedTexImage2D);
- GET_PROC(CopyTexSubImage2D);
- GET_PROC(CreateProgram);
- GET_PROC(CreateShader);
- GET_PROC(CullFace);
- GET_PROC(DeleteBuffers);
- GET_PROC(DeleteProgram);
- GET_PROC(DeleteQueries);
- GET_PROC(DeleteShader);
- GET_PROC(DeleteTextures);
- GET_PROC(DepthMask);
- GET_PROC(Disable);
- GET_PROC(DisableVertexAttribArray);
- GET_PROC(DrawArrays);
- GET_PROC(DrawBuffer);
- GET_PROC(DrawBuffers);
- GET_PROC(DrawElements);
- GET_PROC(Enable);
- GET_PROC(EnableVertexAttribArray);
- GET_PROC(EndQuery);
- GET_PROC(Finish);
- GET_PROC(Flush);
- GET_PROC(FrontFace);
- GET_PROC(GenBuffers);
- GET_PROC(GenerateMipmap);
- GET_PROC(GenQueries);
- GET_PROC(GetBufferParameteriv);
- GET_PROC(GetError);
- GET_PROC(GetIntegerv);
- GET_PROC(GetProgramInfoLog);
- GET_PROC(GetProgramiv);
- GET_PROC(GetQueryiv);
- GET_PROC(GetQueryObjectiv);
- GET_PROC(GetQueryObjectuiv);
- GET_PROC(GetShaderInfoLog);
- GET_PROC(GetShaderiv);
- GET_PROC(GetString);
- GET_PROC(GetStringi);
- GET_PROC(GetTexLevelParameteriv);
- GET_PROC(GenTextures);
- GET_PROC(GetUniformLocation);
- GET_PROC(LineWidth);
- GET_PROC(LinkProgram);
- GET_PROC(MapBuffer);
- if (extensions.has("GL_EXT_direct_state_access")) {
- GET_PROC_SUFFIX(MatrixLoadf, EXT);
- GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
- }
- GET_PROC(PixelStorei);
- GET_PROC(ReadBuffer);
- GET_PROC(ReadPixels);
- GET_PROC(Scissor);
- GET_PROC(ShaderSource);
- GET_PROC(StencilFunc);
- GET_PROC(StencilFuncSeparate);
- GET_PROC(StencilMask);
- GET_PROC(StencilMaskSeparate);
- GET_PROC(StencilOp);
- GET_PROC(StencilOpSeparate);
- GET_PROC(TexImage2D);
- GET_PROC(TexParameteri);
- GET_PROC(TexParameteriv);
- if (ver >= GR_GL_VER(4,2) || extensions.has("GL_ARB_texture_storage")) {
- GET_PROC(TexStorage2D);
- } else if (extensions.has("GL_EXT_texture_storage")) {
- GET_PROC_SUFFIX(TexStorage2D, EXT);
- }
- GET_PROC(TexSubImage2D);
- GET_PROC(Uniform1f);
- GET_PROC(Uniform1i);
- GET_PROC(Uniform1fv);
- GET_PROC(Uniform1iv);
- GET_PROC(Uniform2f);
- GET_PROC(Uniform2i);
- GET_PROC(Uniform2fv);
- GET_PROC(Uniform2iv);
- GET_PROC(Uniform3f);
- GET_PROC(Uniform3i);
- GET_PROC(Uniform3fv);
- GET_PROC(Uniform3iv);
- GET_PROC(Uniform4f);
- GET_PROC(Uniform4i);
- GET_PROC(Uniform4fv);
- GET_PROC(Uniform4iv);
- GET_PROC(Uniform4fv);
- GET_PROC(UniformMatrix2fv);
- GET_PROC(UniformMatrix3fv);
- GET_PROC(UniformMatrix4fv);
- GET_PROC(UnmapBuffer);
- GET_PROC(UseProgram);
- GET_PROC(VertexAttrib4fv);
- GET_PROC(VertexAttribPointer);
- GET_PROC(Viewport);
-
- if (ver >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) {
- // no ARB suffix for GL_ARB_vertex_array_object
- GET_PROC(BindVertexArray);
- GET_PROC(DeleteVertexArrays);
- GET_PROC(GenVertexArrays);
- }
-
- if (ver >= GR_GL_VER(3,3) || extensions.has("GL_ARB_timer_query")) {
- // ARB extension doesn't use the ARB suffix on the function name
- GET_PROC(QueryCounter);
- GET_PROC(GetQueryObjecti64v);
- GET_PROC(GetQueryObjectui64v);
- } else if (extensions.has("GL_EXT_timer_query")) {
- GET_PROC_SUFFIX(GetQueryObjecti64v, EXT);
- GET_PROC_SUFFIX(GetQueryObjectui64v, EXT);
- }
-
- if (ver >= GR_GL_VER(3,0) || extensions.has("GL_ARB_framebuffer_object")) {
- // ARB extension doesn't use the ARB suffix on the function names
- GET_PROC(GenFramebuffers);
- GET_PROC(GetFramebufferAttachmentParameteriv);
- GET_PROC(GetRenderbufferParameteriv);
- GET_PROC(BindFramebuffer);
- GET_PROC(FramebufferTexture2D);
- GET_PROC(CheckFramebufferStatus);
- GET_PROC(DeleteFramebuffers);
- GET_PROC(RenderbufferStorage);
- GET_PROC(GenRenderbuffers);
- GET_PROC(DeleteRenderbuffers);
- GET_PROC(FramebufferRenderbuffer);
- GET_PROC(BindRenderbuffer);
- GET_PROC(RenderbufferStorageMultisample);
- GET_PROC(BlitFramebuffer);
- } else {
- if (extensions.has("GL_EXT_framebuffer_object")) {
- GET_PROC_SUFFIX(GenFramebuffers, EXT);
- GET_PROC_SUFFIX(GetFramebufferAttachmentParameteriv, EXT);
- GET_PROC_SUFFIX(GetRenderbufferParameteriv, EXT);
- GET_PROC_SUFFIX(BindFramebuffer, EXT);
- GET_PROC_SUFFIX(FramebufferTexture2D, EXT);
- GET_PROC_SUFFIX(CheckFramebufferStatus, EXT);
- GET_PROC_SUFFIX(DeleteFramebuffers, EXT);
- GET_PROC_SUFFIX(RenderbufferStorage, EXT);
- GET_PROC_SUFFIX(GenRenderbuffers, EXT);
- GET_PROC_SUFFIX(DeleteRenderbuffers, EXT);
- GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT);
- GET_PROC_SUFFIX(BindRenderbuffer, EXT);
- }
- if (extensions.has("GL_EXT_framebuffer_multisample")) {
- GET_PROC_SUFFIX(RenderbufferStorageMultisample, EXT);
- }
- if (extensions.has("GL_EXT_framebuffer_blit")) {
- GET_PROC_SUFFIX(BlitFramebuffer, EXT);
- }
- }
- if (ver >= GR_GL_VER(3,3) || extensions.has("GL_ARB_blend_func_extended")) {
- // ARB extension doesn't use the ARB suffix on the function name
- GET_PROC(BindFragDataLocationIndexed);
+class GLProcGetter {
+public:
+ GLProcGetter() {}
+
+ GrGLFuncPtr getProc(const char name[]) const {
+ return (GrGLFuncPtr) dlsym(fLoader.handle(), name);
}
- if (extensions.has("GL_EXT_debug_marker")) {
- GET_PROC_SUFFIX(InsertEventMarker, EXT);
- GET_PROC_SUFFIX(PushGroupMarker, EXT);
- GET_PROC_SUFFIX(PopGroupMarker, EXT);
- }
+private:
+ GLLoader fLoader;
+};
- if (ver >= GR_GL_VER(4,3) || extensions.has("GL_ARB_invalidate_subdata")) {
- GET_PROC(InvalidateBufferData);
- GET_PROC(InvalidateBufferSubData);
- GET_PROC(InvalidateFramebuffer);
- GET_PROC(InvalidateSubFramebuffer);
- GET_PROC(InvalidateTexImage);
- GET_PROC(InvalidateTexSubImage);
- }
+static GrGLFuncPtr mac_get_gl_proc(void* ctx, const char name[]) {
+ SkASSERT(NULL != ctx);
+ const GLProcGetter* getter = (const GLProcGetter*) ctx;
+ return getter->getProc(name);
+}
- interface->fExtensions.swap(&extensions);
- return interface;
+const GrGLInterface* GrGLCreateNativeInterface() {
+ GLProcGetter getter;
+ return GrGLAssembleGLInterface(&getter, mac_get_gl_proc);
}
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698