diff options
-rw-r--r-- | src/gpu/GrGLInterface.cpp | 12 | ||||
-rw-r--r-- | src/gpu/mesa/GrGLCreateMesaInterface.cpp | 4 | ||||
-rw-r--r-- | src/gpu/unix/GrGLCreateNativeInterface_unix.cpp | 5 | ||||
-rw-r--r-- | src/gpu/win/GrGLCreateNativeInterface_win.cpp | 16 |
4 files changed, 32 insertions, 5 deletions
diff --git a/src/gpu/GrGLInterface.cpp b/src/gpu/GrGLInterface.cpp index db57947885..471b5a66cd 100644 --- a/src/gpu/GrGLInterface.cpp +++ b/src/gpu/GrGLInterface.cpp @@ -110,6 +110,7 @@ GrGLInterface::GrGLInterface() { fActiveTexture = NULL; fAttachShader = NULL; + fBeginQuery = NULL; fBindAttribLocation = NULL; fBindBuffer = NULL; fBindFragDataLocation = NULL; @@ -132,6 +133,7 @@ GrGLInterface::GrGLInterface() { fCullFace = NULL; fDeleteBuffers = NULL; fDeleteProgram = NULL; + fDeleteQueries = NULL; fDeleteShader = NULL; fDeleteTextures = NULL; fDepthMask = NULL; @@ -142,15 +144,24 @@ GrGLInterface::GrGLInterface() { fDrawBuffer = NULL; fDrawBuffers = NULL; fDrawElements = NULL; + fEndQuery = NULL; + fFinish = NULL; + fFlush = NULL; fEnable = NULL; fEnableClientState = NULL; fEnableVertexAttribArray = NULL; fFrontFace = NULL; fGenBuffers = NULL; + fGenQueries = NULL; fGenTextures = NULL; fGetBufferParameteriv = NULL; fGetError = NULL; fGetIntegerv = NULL; + fGetQueryiv = NULL; + fGetQueryObjecti64v = NULL; + fGetQueryObjectiv = NULL; + fGetQueryObjectui64v = NULL; + fGetQueryObjectuiv = NULL; fGetProgramInfoLog = NULL; fGetProgramiv = NULL; fGetShaderInfoLog = NULL; @@ -164,6 +175,7 @@ GrGLInterface::GrGLInterface() { fMatrixMode = NULL; fPixelStorei = NULL; fPointSize = NULL; + fQueryCounter = NULL; fReadBuffer = NULL; fReadPixels = NULL; fScissor = NULL; diff --git a/src/gpu/mesa/GrGLCreateMesaInterface.cpp b/src/gpu/mesa/GrGLCreateMesaInterface.cpp index f7d162668d..a3442ba2a0 100644 --- a/src/gpu/mesa/GrGLCreateMesaInterface.cpp +++ b/src/gpu/mesa/GrGLCreateMesaInterface.cpp @@ -92,8 +92,8 @@ const GrGLInterface* GrGLCreateMesaInterface() { GR_GL_GET_PROC(GetQueryObjectui64v) GR_GL_GET_PROC(QueryCounter); } else if (GrGLHasExtensionFromString("GL_EXT_timer_query", extString)) { - GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, "EXT"); - GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, "EXT"); + GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, EXT); + GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, EXT); } GR_GL_GET_PROC(GetQueryObjectiv); GR_GL_GET_PROC(GetQueryObjectuiv); diff --git a/src/gpu/unix/GrGLCreateNativeInterface_unix.cpp b/src/gpu/unix/GrGLCreateNativeInterface_unix.cpp index 90338a5992..dc2da9a88f 100644 --- a/src/gpu/unix/GrGLCreateNativeInterface_unix.cpp +++ b/src/gpu/unix/GrGLCreateNativeInterface_unix.cpp @@ -91,8 +91,8 @@ const GrGLInterface* GrGLCreateNativeInterface() { GR_GL_GET_PROC(GetQueryObjectui64v); GR_GL_GET_PROC(QueryCounter); } else if (GrGLHasExtensionFromString("GL_EXT_timer_query", extString)) { - GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, "EXT"); - GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, "EXT"); + GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, EXT); + GR_GL_GET_PROC_SUFFIX(GetQueryObjectui64v, EXT); } GR_GL_GET_PROC(GetQueryiv); GR_GL_GET_PROC(GetProgramInfoLog); @@ -111,7 +111,6 @@ const GrGLInterface* GrGLCreateNativeInterface() { interface->fMatrixMode = glMatrixMode; interface->fPointSize = glPointSize; interface->fPixelStorei = glPixelStorei; - interface->fReadBuffer = glReadBuffer; interface->fReadPixels = glReadPixels; interface->fScissor = glScissor; diff --git a/src/gpu/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/win/GrGLCreateNativeInterface_win.cpp index d0189064f7..e00a39259f 100644 --- a/src/gpu/win/GrGLCreateNativeInterface_win.cpp +++ b/src/gpu/win/GrGLCreateNativeInterface_win.cpp @@ -91,6 +91,7 @@ const GrGLInterface* GrGLCreateNativeInterface() { GR_GL_GET_PROC(ActiveTexture); GR_GL_GET_PROC(AttachShader); + GR_GL_GET_PROC(BeginQuery); GR_GL_GET_PROC(BindAttribLocation); GR_GL_GET_PROC(BindBuffer); GR_GL_GET_PROC(BindFragDataLocation); @@ -103,13 +104,28 @@ const GrGLInterface* GrGLCreateNativeInterface() { GR_GL_GET_PROC(CreateProgram); GR_GL_GET_PROC(CreateShader); GR_GL_GET_PROC(DeleteBuffers); + GR_GL_GET_PROC(DeleteQueries); GR_GL_GET_PROC(DeleteProgram); GR_GL_GET_PROC(DeleteShader); GR_GL_GET_PROC(DisableVertexAttribArray); GR_GL_GET_PROC(DrawBuffers); GR_GL_GET_PROC(EnableVertexAttribArray); + GR_GL_GET_PROC(EndQuery); GR_GL_GET_PROC(GenBuffers); + GR_GL_GET_PROC(GenQueries); GR_GL_GET_PROC(GetBufferParameteriv); + GR_GL_GET_PROC(GetQueryiv); + GR_GL_GET_PROC(GetQueryObjectiv); + GR_GL_GET_PROC(GetQueryObjectuiv); + if (glVer > GR_GL_VER(3,3) || + GrGLHasExtensionFromString("GL_ARB_timer_query", extString)) { + GR_GL_GET_PROC(GetQueryObjecti64v); + GR_GL_GET_PROC(GetQueryObjectui64v); + GR_GL_GET_PROC(QueryCounter); + } else if (GrGLHasExtensionFromString("GL_EXT_timer_query", extString)) { + GR_GL_GET_PROC_SUFFIX(GetQueryObjecti64v, EXT); + GR_GL_GET_PROC(GetQueryObjectui64v, EXT); + } GR_GL_GET_PROC(GetProgramInfoLog); GR_GL_GET_PROC(GetProgramiv); GR_GL_GET_PROC(GetShaderInfoLog); |