Skip to content

E
engine

sxychenjing / engine
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
E
engine

体验新版 GitCode，发现更多精彩内容 >>

提交 2c1db4b8 编写于 作者: C Chinmay Garde
浏览文件
操作

Add GL bindings for extensions "GL_KHR_blend_equation" and "GL_KHR_debug"

上级 0c59c496
展开全部 隐藏空白更改
内联 并排
Showing with 2601 addition and 2810 deletion
ui/gl/generate_bindings.py
浏览文件 @ 2c1db4b8
......@@ -243,6 +243,20 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glCullFace'],
'arguments': 'GLenum mode', },
{ 'return_type': 'void',
'versions': [{ 'name': 'glDebugMessageCallbackKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLDEBUGPROCKHR callback, const void* userparam' },
{ 'return_type': 'void',
'versions': [{ 'name': 'glDebugMessageControlKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLenum source, GLenum type, GLenum severity, GLsizei count, '
'const GLuint* ids, GLboolean enabled' },
{ 'return_type': 'void',
'versions': [{ 'name': 'glDebugMessageInsertKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLenum source, GLenum type, GLuint id, GLenum severity, '
'GLsizei length, const GLchar* buf' },
{ 'return_type': 'void',
'names': ['glDeleteBuffers'],
'known_as': 'glDeleteBuffersARB',
......@@ -498,6 +512,12 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glGetBufferParameteriv'],
'arguments': 'GLenum target, GLenum pname, GLint* params', },
{ 'return_type': 'GLuint',
'versions': [{ 'name': 'glGetDebugMessageLogKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, '
'GLuint* ids, GLenum* severities, GLsizei* lengths, '
'GLchar* messageLog' },
{ 'return_type': 'GLenum',
'names': ['glGetError'],
'arguments': 'void',
......@@ -763,6 +783,11 @@ GL_FUNCTIONS = [
'extensions': ['GL_EXT_direct_state_access',
'GL_NV_path_rendering'] },],
'arguments': 'GLenum matrixMode' },
{ 'return_type': 'void',
'versions': [{ 'name': 'glObjectLabelKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLenum identifier, GLuint name, GLsizei length, '
'const GLchar* label' },
{ 'return_type': 'void',
'versions': [{ 'name': 'glPauseTransformFeedback' }],
'arguments': 'void', },
......@@ -775,6 +800,10 @@ GL_FUNCTIONS = [
{ 'return_type': 'void',
'names': ['glPolygonOffset'],
'arguments': 'GLfloat factor, GLfloat units', },
{ 'return_type': 'void',
'versions': [{ 'name': 'glPopDebugGroupKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'void' },
{ 'return_type': 'void',
'names': ['glPopGroupMarkerEXT'],
'arguments': 'void', },
......@@ -789,6 +818,11 @@ GL_FUNCTIONS = [
'versions': [{ 'name': 'glProgramParameteri',
'extensions': ['GL_ARB_get_program_binary'] }],
'arguments': 'GLuint program, GLenum pname, GLint value' },
{ 'return_type': 'void',
'versions': [{ 'name': 'glPushDebugGroupKHR',
'extensions': ['GL_KHR_debug'] }],
'arguments': 'GLenum source, GLuint id, GLsizei length, '
'const GLchar* message' },
{ 'return_type': 'void',
'names': ['glPushGroupMarkerEXT'],
'arguments': 'GLsizei length, const char* marker', },
......
ui/gl/gl_bindings.h
浏览文件 @ 2c1db4b8
......@@ -300,6 +300,10 @@ typedef void (*OSMESAproc)();
// Forward declare EGL types.
typedef uint64 EGLuint64CHROMIUM;
typedef void (*GLDEBUGPROCKHR)(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei length,
const GLchar *message, void *userParam);
#include "gl_bindings_autogen_gl.h"
#include "gl_bindings_autogen_osmesa.h"
......
ui/gl/gl_bindings_api_autogen_gl.h
浏览文件 @ 2c1db4b8
......@@ -174,6 +174,20 @@ void glCopyTexSubImage3DFn(GLenum target,
GLuint glCreateProgramFn(void) override;
GLuint glCreateShaderFn(GLenum type) override;
void glCullFaceFn(GLenum mode) override;
void glDebugMessageCallbackKHRFn(GLDEBUGPROCKHR callback,
const void* userparam) override;
void glDebugMessageControlKHRFn(GLenum source,
GLenum type,
GLenum severity,
GLsizei count,
const GLuint* ids,
GLboolean enabled) override;
void glDebugMessageInsertKHRFn(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* buf) override;
void glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) override;
void glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) override;
void glDeleteFencesNVFn(GLsizei n, const GLuint* fences) override;
......@@ -311,6 +325,14 @@ void glGetBooleanvFn(GLenum pname, GLboolean* params) override;
void glGetBufferParameterivFn(GLenum target,
GLenum pname,
GLint* params) override;
GLuint glGetDebugMessageLogKHRFn(GLuint count,
GLsizei bufSize,
GLenum* sources,
GLenum* types,
GLuint* ids,
GLenum* severities,
GLsizei* lengths,
GLchar* messageLog) override;
GLenum glGetErrorFn(void) override;
void glGetFenceivNVFn(GLuint fence, GLenum pname, GLint* params) override;
void glGetFloatvFn(GLenum pname, GLfloat* params) override;
......@@ -452,16 +474,25 @@ void* glMapBufferRangeFn(GLenum target,
GLbitfield access) override;
void glMatrixLoadfEXTFn(GLenum matrixMode, const GLfloat* m) override;
void glMatrixLoadIdentityEXTFn(GLenum matrixMode) override;
void glObjectLabelKHRFn(GLenum identifier,
GLuint name,
GLsizei length,
const GLchar* label) override;
void glPauseTransformFeedbackFn(void) override;
void glPixelStoreiFn(GLenum pname, GLint param) override;
void glPointParameteriFn(GLenum pname, GLint param) override;
void glPolygonOffsetFn(GLfloat factor, GLfloat units) override;
void glPopDebugGroupKHRFn(void) override;
void glPopGroupMarkerEXTFn(void) override;
void glProgramBinaryFn(GLuint program,
GLenum binaryFormat,
const GLvoid* binary,
GLsizei length) override;
void glProgramParameteriFn(GLuint program, GLenum pname, GLint value) override;
void glPushDebugGroupKHRFn(GLenum source,
GLuint id,
GLsizei length,
const GLchar* message) override;
void glPushGroupMarkerEXTFn(GLsizei length, const char* marker) override;
void glQueryCounterFn(GLuint id, GLenum target) override;
void glReadBufferFn(GLenum src) override;
......
ui/gl/gl_bindings_autogen_egl.cc
浏览文件 @ 2c1db4b8
......@@ -229,8 +229,9 @@ static EGLBoolean GL_BINDING_CALL Debug_eglBindAPI(EGLenum api) {
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) {
static EGLBoolean GL_BINDING_CALL Debug_eglBindTexImage(EGLDisplay dpy,
EGLSurface surface,
EGLint buffer) {
GL_SERVICE_LOG("eglBindTexImage"
<< "(" << dpy << ", " << surface << ", " << buffer << ")");
EGLBoolean result =
......@@ -381,8 +382,8 @@ Debug_eglCreateWindowSurface(EGLDisplay dpy,
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglDestroyContext(EGLDisplay dpy, EGLContext ctx) {
static EGLBoolean GL_BINDING_CALL Debug_eglDestroyContext(EGLDisplay dpy,
EGLContext ctx) {
GL_SERVICE_LOG("eglDestroyContext"
<< "(" << dpy << ", " << ctx << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglDestroyContextFn(dpy, ctx);
......@@ -390,8 +391,8 @@ Debug_eglDestroyContext(EGLDisplay dpy, EGLContext ctx) {
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) {
static EGLBoolean GL_BINDING_CALL Debug_eglDestroyImageKHR(EGLDisplay dpy,
EGLImageKHR image) {
GL_SERVICE_LOG("eglDestroyImageKHR"
<< "(" << dpy << ", " << image << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglDestroyImageKHRFn(dpy, image);
......@@ -399,8 +400,8 @@ Debug_eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) {
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglDestroySurface(EGLDisplay dpy, EGLSurface surface) {
static EGLBoolean GL_BINDING_CALL Debug_eglDestroySurface(EGLDisplay dpy,
EGLSurface surface) {
GL_SERVICE_LOG("eglDestroySurface"
<< "(" << dpy << ", " << surface << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglDestroySurfaceFn(dpy, surface);
......@@ -408,8 +409,8 @@ Debug_eglDestroySurface(EGLDisplay dpy, EGLSurface surface) {
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync) {
static EGLBoolean GL_BINDING_CALL Debug_eglDestroySyncKHR(EGLDisplay dpy,
EGLSyncKHR sync) {
GL_SERVICE_LOG("eglDestroySyncKHR"
<< "(" << dpy << ", " << sync << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglDestroySyncKHRFn(dpy, sync);
......@@ -542,8 +543,9 @@ Debug_eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglInitialize(EGLDisplay dpy, EGLint* major, EGLint* minor) {
static EGLBoolean GL_BINDING_CALL Debug_eglInitialize(EGLDisplay dpy,
EGLint* major,
EGLint* minor) {
GL_SERVICE_LOG("eglInitialize"
<< "(" << dpy << ", " << static_cast<const void*>(major)
<< ", " << static_cast<const void*>(minor) << ")");
......@@ -602,8 +604,8 @@ static EGLBoolean GL_BINDING_CALL Debug_eglQueryContext(EGLDisplay dpy,
return result;
}
static const char* GL_BINDING_CALL
Debug_eglQueryString(EGLDisplay dpy, EGLint name) {
static const char* GL_BINDING_CALL Debug_eglQueryString(EGLDisplay dpy,
EGLint name) {
GL_SERVICE_LOG("eglQueryString"
<< "(" << dpy << ", " << name << ")");
const char* result = g_driver_egl.debug_fn.eglQueryStringFn(dpy, name);
......@@ -638,8 +640,9 @@ Debug_eglQuerySurfacePointerANGLE(EGLDisplay dpy,
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) {
static EGLBoolean GL_BINDING_CALL Debug_eglReleaseTexImage(EGLDisplay dpy,
EGLSurface surface,
EGLint buffer) {
GL_SERVICE_LOG("eglReleaseTexImage"
<< "(" << dpy << ", " << surface << ", " << buffer << ")");
EGLBoolean result =
......@@ -670,8 +673,8 @@ static EGLBoolean GL_BINDING_CALL Debug_eglSurfaceAttrib(EGLDisplay dpy,
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) {
static EGLBoolean GL_BINDING_CALL Debug_eglSwapBuffers(EGLDisplay dpy,
EGLSurface surface) {
GL_SERVICE_LOG("eglSwapBuffers"
<< "(" << dpy << ", " << surface << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglSwapBuffersFn(dpy, surface);
......@@ -679,8 +682,8 @@ Debug_eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) {
return result;
}
static EGLBoolean GL_BINDING_CALL
Debug_eglSwapInterval(EGLDisplay dpy, EGLint interval) {
static EGLBoolean GL_BINDING_CALL Debug_eglSwapInterval(EGLDisplay dpy,
EGLint interval) {
GL_SERVICE_LOG("eglSwapInterval"
<< "(" << dpy << ", " << interval << ")");
EGLBoolean result = g_driver_egl.debug_fn.eglSwapIntervalFn(dpy, interval);
......@@ -722,8 +725,9 @@ static EGLBoolean GL_BINDING_CALL Debug_eglWaitNative(EGLint engine) {
return result;
}
static EGLint GL_BINDING_CALL
Debug_eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags) {
static EGLint GL_BINDING_CALL Debug_eglWaitSyncKHR(EGLDisplay dpy,
EGLSyncKHR sync,
EGLint flags) {
GL_SERVICE_LOG("eglWaitSyncKHR"
<< "(" << dpy << ", " << sync << ", " << flags << ")");
EGLint result = g_driver_egl.debug_fn.eglWaitSyncKHRFn(dpy, sync, flags);
......
ui/gl/gl_bindings_autogen_gl.cc
浏览文件 @ 2c1db4b8
此差异已折叠。
ui/gl/gl_bindings_autogen_gl.h
浏览文件 @ 2c1db4b8
......@@ -190,6 +190,21 @@ typedef void(GL_BINDING_CALL* glCopyTexSubImage3DProc)(GLenum target,
typedef GLuint(GL_BINDING_CALL* glCreateProgramProc)(void);
typedef GLuint(GL_BINDING_CALL* glCreateShaderProc)(GLenum type);
typedef void(GL_BINDING_CALL* glCullFaceProc)(GLenum mode);
typedef void(GL_BINDING_CALL* glDebugMessageCallbackKHRProc)(
GLDEBUGPROCKHR callback,
const void* userparam);
typedef void(GL_BINDING_CALL* glDebugMessageControlKHRProc)(GLenum source,
GLenum type,
GLenum severity,
GLsizei count,
const GLuint* ids,
GLboolean enabled);
typedef void(GL_BINDING_CALL* glDebugMessageInsertKHRProc)(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* buf);
typedef void(GL_BINDING_CALL* glDeleteBuffersARBProc)(GLsizei n,
const GLuint* buffers);
typedef void(GL_BINDING_CALL* glDeleteFencesAPPLEProc)(GLsizei n,
......@@ -362,6 +377,15 @@ typedef void(GL_BINDING_CALL* glGetBooleanvProc)(GLenum pname,
typedef void(GL_BINDING_CALL* glGetBufferParameterivProc)(GLenum target,
GLenum pname,
GLint* params);
typedef GLuint(GL_BINDING_CALL* glGetDebugMessageLogKHRProc)(
GLuint count,
GLsizei bufSize,
GLenum* sources,
GLenum* types,
GLuint* ids,
GLenum* severities,
GLsizei* lengths,
GLchar* messageLog);
typedef GLenum(GL_BINDING_CALL* glGetErrorProc)(void);
typedef void(GL_BINDING_CALL* glGetFenceivNVProc)(GLuint fence,
GLenum pname,
......@@ -546,11 +570,16 @@ typedef void*(GL_BINDING_CALL* glMapBufferRangeProc)(GLenum target,
typedef void(GL_BINDING_CALL* glMatrixLoadfEXTProc)(GLenum matrixMode,
const GLfloat* m);
typedef void(GL_BINDING_CALL* glMatrixLoadIdentityEXTProc)(GLenum matrixMode);
typedef void(GL_BINDING_CALL* glObjectLabelKHRProc)(GLenum identifier,
GLuint name,
GLsizei length,
const GLchar* label);
typedef void(GL_BINDING_CALL* glPauseTransformFeedbackProc)(void);
typedef void(GL_BINDING_CALL* glPixelStoreiProc)(GLenum pname, GLint param);
typedef void(GL_BINDING_CALL* glPointParameteriProc)(GLenum pname, GLint param);
typedef void(GL_BINDING_CALL* glPolygonOffsetProc)(GLfloat factor,
GLfloat units);
typedef void(GL_BINDING_CALL* glPopDebugGroupKHRProc)(void);
typedef void(GL_BINDING_CALL* glPopGroupMarkerEXTProc)(void);
typedef void(GL_BINDING_CALL* glProgramBinaryProc)(GLuint program,
GLenum binaryFormat,
......@@ -559,6 +588,10 @@ typedef void(GL_BINDING_CALL* glProgramBinaryProc)(GLuint program,
typedef void(GL_BINDING_CALL* glProgramParameteriProc)(GLuint program,
GLenum pname,
GLint value);
typedef void(GL_BINDING_CALL* glPushDebugGroupKHRProc)(GLenum source,
GLuint id,
GLsizei length,
const GLchar* message);
typedef void(GL_BINDING_CALL* glPushGroupMarkerEXTProc)(GLsizei length,
const char* marker);
typedef void(GL_BINDING_CALL* glQueryCounterProc)(GLuint id, GLenum target);
......@@ -922,6 +955,7 @@ struct ExtensionsGL {
bool b_GL_EXT_timer_query;
bool b_GL_IMG_multisampled_render_to_texture;
bool b_GL_KHR_blend_equation_advanced;
bool b_GL_KHR_debug;
bool b_GL_KHR_robustness;
bool b_GL_NV_blend_equation_advanced;
bool b_GL_NV_fence;
......@@ -983,6 +1017,9 @@ struct ProcsGL {
glCreateProgramProc glCreateProgramFn;
glCreateShaderProc glCreateShaderFn;
glCullFaceProc glCullFaceFn;
glDebugMessageCallbackKHRProc glDebugMessageCallbackKHRFn;
glDebugMessageControlKHRProc glDebugMessageControlKHRFn;
glDebugMessageInsertKHRProc glDebugMessageInsertKHRFn;
glDeleteBuffersARBProc glDeleteBuffersARBFn;
glDeleteFencesAPPLEProc glDeleteFencesAPPLEFn;
glDeleteFencesNVProc glDeleteFencesNVFn;
......@@ -1052,6 +1089,7 @@ struct ProcsGL {
glGetAttribLocationProc glGetAttribLocationFn;
glGetBooleanvProc glGetBooleanvFn;
glGetBufferParameterivProc glGetBufferParameterivFn;
glGetDebugMessageLogKHRProc glGetDebugMessageLogKHRFn;
glGetErrorProc glGetErrorFn;
glGetFenceivNVProc glGetFenceivNVFn;
glGetFloatvProc glGetFloatvFn;
......@@ -1121,13 +1159,16 @@ struct ProcsGL {
glMapBufferRangeProc glMapBufferRangeFn;
glMatrixLoadfEXTProc glMatrixLoadfEXTFn;
glMatrixLoadIdentityEXTProc glMatrixLoadIdentityEXTFn;
glObjectLabelKHRProc glObjectLabelKHRFn;
glPauseTransformFeedbackProc glPauseTransformFeedbackFn;
glPixelStoreiProc glPixelStoreiFn;
glPointParameteriProc glPointParameteriFn;
glPolygonOffsetProc glPolygonOffsetFn;
glPopDebugGroupKHRProc glPopDebugGroupKHRFn;
glPopGroupMarkerEXTProc glPopGroupMarkerEXTFn;
glProgramBinaryProc glProgramBinaryFn;
glProgramParameteriProc glProgramParameteriFn;
glPushDebugGroupKHRProc glPushDebugGroupKHRFn;
glPushGroupMarkerEXTProc glPushGroupMarkerEXTFn;
glQueryCounterProc glQueryCounterFn;
glReadBufferProc glReadBufferFn;
......@@ -1401,6 +1442,20 @@ class GL_EXPORT GLApi {
virtual GLuint glCreateProgramFn(void) = 0;
virtual GLuint glCreateShaderFn(GLenum type) = 0;
virtual void glCullFaceFn(GLenum mode) = 0;
virtual void glDebugMessageCallbackKHRFn(GLDEBUGPROCKHR callback,
const void* userparam) = 0;
virtual void glDebugMessageControlKHRFn(GLenum source,
GLenum type,
GLenum severity,
GLsizei count,
const GLuint* ids,
GLboolean enabled) = 0;
virtual void glDebugMessageInsertKHRFn(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* buf) = 0;
virtual void glDeleteBuffersARBFn(GLsizei n, const GLuint* buffers) = 0;
virtual void glDeleteFencesAPPLEFn(GLsizei n, const GLuint* fences) = 0;
virtual void glDeleteFencesNVFn(GLsizei n, const GLuint* fences) = 0;
......@@ -1540,6 +1595,14 @@ class GL_EXPORT GLApi {
virtual void glGetBufferParameterivFn(GLenum target,
GLenum pname,
GLint* params) = 0;
virtual GLuint glGetDebugMessageLogKHRFn(GLuint count,
GLsizei bufSize,
GLenum* sources,
GLenum* types,
GLuint* ids,
GLenum* severities,
GLsizei* lengths,
GLchar* messageLog) = 0;
virtual GLenum glGetErrorFn(void) = 0;
virtual void glGetFenceivNVFn(GLuint fence, GLenum pname, GLint* params) = 0;
virtual void glGetFloatvFn(GLenum pname, GLfloat* params) = 0;
......@@ -1697,10 +1760,15 @@ class GL_EXPORT GLApi {
GLbitfield access) = 0;
virtual void glMatrixLoadfEXTFn(GLenum matrixMode, const GLfloat* m) = 0;
virtual void glMatrixLoadIdentityEXTFn(GLenum matrixMode) = 0;
virtual void glObjectLabelKHRFn(GLenum identifier,
GLuint name,
GLsizei length,
const GLchar* label) = 0;
virtual void glPauseTransformFeedbackFn(void) = 0;
virtual void glPixelStoreiFn(GLenum pname, GLint param) = 0;
virtual void glPointParameteriFn(GLenum pname, GLint param) = 0;
virtual void glPolygonOffsetFn(GLfloat factor, GLfloat units) = 0;
virtual void glPopDebugGroupKHRFn(void) = 0;
virtual void glPopGroupMarkerEXTFn(void) = 0;
virtual void glProgramBinaryFn(GLuint program,
GLenum binaryFormat,
......@@ -1709,6 +1777,10 @@ class GL_EXPORT GLApi {
virtual void glProgramParameteriFn(GLuint program,
GLenum pname,
GLint value) = 0;
virtual void glPushDebugGroupKHRFn(GLenum source,
GLuint id,
GLsizei length,
const GLchar* message) = 0;
virtual void glPushGroupMarkerEXTFn(GLsizei length, const char* marker) = 0;
virtual void glQueryCounterFn(GLuint id, GLenum target) = 0;
virtual void glReadBufferFn(GLenum src) = 0;
......@@ -2062,6 +2134,12 @@ class GL_EXPORT GLApi {
#define glCreateProgram ::gfx::g_current_gl_context->glCreateProgramFn
#define glCreateShader ::gfx::g_current_gl_context->glCreateShaderFn
#define glCullFace ::gfx::g_current_gl_context->glCullFaceFn
#define glDebugMessageCallbackKHR \
::gfx::g_current_gl_context->glDebugMessageCallbackKHRFn
#define glDebugMessageControlKHR \
::gfx::g_current_gl_context->glDebugMessageControlKHRFn
#define glDebugMessageInsertKHR \
::gfx::g_current_gl_context->glDebugMessageInsertKHRFn
#define glDeleteBuffersARB ::gfx::g_current_gl_context->glDeleteBuffersARBFn
#define glDeleteFencesAPPLE ::gfx::g_current_gl_context->glDeleteFencesAPPLEFn
#define glDeleteFencesNV ::gfx::g_current_gl_context->glDeleteFencesNVFn
......@@ -2152,6 +2230,8 @@ class GL_EXPORT GLApi {
#define glGetBooleanv ::gfx::g_current_gl_context->glGetBooleanvFn
#define glGetBufferParameteriv \
::gfx::g_current_gl_context->glGetBufferParameterivFn
#define glGetDebugMessageLogKHR \
::gfx::g_current_gl_context->glGetDebugMessageLogKHRFn
#define glGetError ::gfx::g_current_gl_context->glGetErrorFn
#define glGetFenceivNV ::gfx::g_current_gl_context->glGetFenceivNVFn
#define glGetFloatv ::gfx::g_current_gl_context->glGetFloatvFn
......@@ -2241,14 +2321,17 @@ class GL_EXPORT GLApi {
#define glMatrixLoadfEXT ::gfx::g_current_gl_context->glMatrixLoadfEXTFn
#define glMatrixLoadIdentityEXT \
::gfx::g_current_gl_context->glMatrixLoadIdentityEXTFn
#define glObjectLabelKHR ::gfx::g_current_gl_context->glObjectLabelKHRFn
#define glPauseTransformFeedback \
::gfx::g_current_gl_context->glPauseTransformFeedbackFn
#define glPixelStorei ::gfx::g_current_gl_context->glPixelStoreiFn
#define glPointParameteri ::gfx::g_current_gl_context->glPointParameteriFn
#define glPolygonOffset ::gfx::g_current_gl_context->glPolygonOffsetFn
#define glPopDebugGroupKHR ::gfx::g_current_gl_context->glPopDebugGroupKHRFn
#define glPopGroupMarkerEXT ::gfx::g_current_gl_context->glPopGroupMarkerEXTFn
#define glProgramBinary ::gfx::g_current_gl_context->glProgramBinaryFn
#define glProgramParameteri ::gfx::g_current_gl_context->glProgramParameteriFn
#define glPushDebugGroupKHR ::gfx::g_current_gl_context->glPushDebugGroupKHRFn
#define glPushGroupMarkerEXT ::gfx::g_current_gl_context->glPushGroupMarkerEXTFn
#define glQueryCounter ::gfx::g_current_gl_context->glQueryCounterFn
#define glReadBuffer ::gfx::g_current_gl_context->glReadBufferFn
......
ui/gl/gl_bindings_autogen_glx.cc
浏览文件 @ 2c1db4b8
......@@ -237,8 +237,9 @@ Debug_glXChooseFBConfig(Display* dpy,
return result;
}
static XVisualInfo* GL_BINDING_CALL
Debug_glXChooseVisual(Display* dpy, int screen, int* attribList) {
static XVisualInfo* GL_BINDING_CALL Debug_glXChooseVisual(Display* dpy,
int screen,
int* attribList) {
GL_SERVICE_LOG("glXChooseVisual"
<< "(" << static_cast<const void*>(dpy) << ", " << screen
<< ", " << static_cast<const void*>(attribList) << ")");
......@@ -302,8 +303,9 @@ Debug_glXCreateContextAttribsARB(Display* dpy,
return result;
}
static GLXPixmap GL_BINDING_CALL
Debug_glXCreateGLXPixmap(Display* dpy, XVisualInfo* visual, Pixmap pixmap) {
static GLXPixmap GL_BINDING_CALL Debug_glXCreateGLXPixmap(Display* dpy,
XVisualInfo* visual,
Pixmap pixmap) {
GL_SERVICE_LOG("glXCreateGLXPixmap"
<< "(" << static_cast<const void*>(dpy) << ", "
<< static_cast<const void*>(visual) << ", " << pixmap << ")");
......@@ -370,47 +372,47 @@ static GLXWindow GL_BINDING_CALL Debug_glXCreateWindow(Display* dpy,
return result;
}
static void GL_BINDING_CALL
Debug_glXDestroyContext(Display* dpy, GLXContext ctx) {
static void GL_BINDING_CALL Debug_glXDestroyContext(Display* dpy,
GLXContext ctx) {
GL_SERVICE_LOG("glXDestroyContext"
<< "(" << static_cast<const void*>(dpy) << ", " << ctx << ")");
g_driver_glx.debug_fn.glXDestroyContextFn(dpy, ctx);
}
static void GL_BINDING_CALL
Debug_glXDestroyGLXPixmap(Display* dpy, GLXPixmap pixmap) {
static void GL_BINDING_CALL Debug_glXDestroyGLXPixmap(Display* dpy,
GLXPixmap pixmap) {
GL_SERVICE_LOG("glXDestroyGLXPixmap"
<< "(" << static_cast<const void*>(dpy) << ", " << pixmap
<< ")");
g_driver_glx.debug_fn.glXDestroyGLXPixmapFn(dpy, pixmap);
}
static void GL_BINDING_CALL
Debug_glXDestroyPbuffer(Display* dpy, GLXPbuffer pbuf) {
static void GL_BINDING_CALL Debug_glXDestroyPbuffer(Display* dpy,
GLXPbuffer pbuf) {
GL_SERVICE_LOG("glXDestroyPbuffer"
<< "(" << static_cast<const void*>(dpy) << ", " << pbuf
<< ")");
g_driver_glx.debug_fn.glXDestroyPbufferFn(dpy, pbuf);
}
static void GL_BINDING_CALL
Debug_glXDestroyPixmap(Display* dpy, GLXPixmap pixmap) {
static void GL_BINDING_CALL Debug_glXDestroyPixmap(Display* dpy,
GLXPixmap pixmap) {
GL_SERVICE_LOG("glXDestroyPixmap"
<< "(" << static_cast<const void*>(dpy) << ", " << pixmap
<< ")");
g_driver_glx.debug_fn.glXDestroyPixmapFn(dpy, pixmap);
}
static void GL_BINDING_CALL
Debug_glXDestroyWindow(Display* dpy, GLXWindow window) {
static void GL_BINDING_CALL Debug_glXDestroyWindow(Display* dpy,
GLXWindow window) {
GL_SERVICE_LOG("glXDestroyWindow"
<< "(" << static_cast<const void*>(dpy) << ", " << window
<< ")");
g_driver_glx.debug_fn.glXDestroyWindowFn(dpy, window);
}
static const char* GL_BINDING_CALL
Debug_glXGetClientString(Display* dpy, int name) {
static const char* GL_BINDING_CALL Debug_glXGetClientString(Display* dpy,
int name) {
GL_SERVICE_LOG("glXGetClientString"
<< "(" << static_cast<const void*>(dpy) << ", " << name
<< ")");
......@@ -419,8 +421,10 @@ Debug_glXGetClientString(Display* dpy, int name) {
return result;
}
static int GL_BINDING_CALL
Debug_glXGetConfig(Display* dpy, XVisualInfo* visual, int attrib, int* value) {
static int GL_BINDING_CALL Debug_glXGetConfig(Display* dpy,
XVisualInfo* visual,
int attrib,
int* value) {
GL_SERVICE_LOG("glXGetConfig"
<< "(" << static_cast<const void*>(dpy) << ", "
<< static_cast<const void*>(visual) << ", " << attrib << ", "
......@@ -491,8 +495,9 @@ Debug_glXGetFBConfigFromVisualSGIX(Display* dpy, XVisualInfo* visualInfo) {
return result;
}
static GLXFBConfig* GL_BINDING_CALL
Debug_glXGetFBConfigs(Display* dpy, int screen, int* nelements) {
static GLXFBConfig* GL_BINDING_CALL Debug_glXGetFBConfigs(Display* dpy,
int screen,
int* nelements) {
GL_SERVICE_LOG("glXGetFBConfigs"
<< "(" << static_cast<const void*>(dpy) << ", " << screen
<< ", " << static_cast<const void*>(nelements) << ")");
......@@ -573,8 +578,9 @@ static int GL_BINDING_CALL Debug_glXMakeContextCurrent(Display* dpy,
return result;
}
static int GL_BINDING_CALL
Debug_glXMakeCurrent(Display* dpy, GLXDrawable drawable, GLXContext ctx) {
static int GL_BINDING_CALL Debug_glXMakeCurrent(Display* dpy,
GLXDrawable drawable,
GLXContext ctx) {
GL_SERVICE_LOG("glXMakeCurrent"
<< "(" << static_cast<const void*>(dpy) << ", " << drawable
<< ", " << ctx << ")");
......@@ -583,8 +589,10 @@ Debug_glXMakeCurrent(Display* dpy, GLXDrawable drawable, GLXContext ctx) {
return result;
}
static int GL_BINDING_CALL
Debug_glXQueryContext(Display* dpy, GLXContext ctx, int attribute, int* value) {
static int GL_BINDING_CALL Debug_glXQueryContext(Display* dpy,
GLXContext ctx,
int attribute,
int* value) {
GL_SERVICE_LOG("glXQueryContext"
<< "(" << static_cast<const void*>(dpy) << ", " << ctx << ", "
<< attribute << ", " << static_cast<const void*>(value)
......@@ -606,8 +614,9 @@ static void GL_BINDING_CALL Debug_glXQueryDrawable(Display* dpy,
g_driver_glx.debug_fn.glXQueryDrawableFn(dpy, draw, attribute, value);
}
static int GL_BINDING_CALL
Debug_glXQueryExtension(Display* dpy, int* errorb, int* event) {
static int GL_BINDING_CALL Debug_glXQueryExtension(Display* dpy,
int* errorb,
int* event) {
GL_SERVICE_LOG("glXQueryExtension"
<< "(" << static_cast<const void*>(dpy) << ", "
<< static_cast<const void*>(errorb) << ", "
......@@ -617,8 +626,8 @@ Debug_glXQueryExtension(Display* dpy, int* errorb, int* event) {
return result;
}
static const char* GL_BINDING_CALL
Debug_glXQueryExtensionsString(Display* dpy, int screen) {
static const char* GL_BINDING_CALL Debug_glXQueryExtensionsString(Display* dpy,
int screen) {
GL_SERVICE_LOG("glXQueryExtensionsString"
<< "(" << static_cast<const void*>(dpy) << ", " << screen
<< ")");
......@@ -628,8 +637,9 @@ Debug_glXQueryExtensionsString(Display* dpy, int screen) {
return result;
}
static const char* GL_BINDING_CALL
Debug_glXQueryServerString(Display* dpy, int screen, int name) {
static const char* GL_BINDING_CALL Debug_glXQueryServerString(Display* dpy,
int screen,
int name) {
GL_SERVICE_LOG("glXQueryServerString"
<< "(" << static_cast<const void*>(dpy) << ", " << screen
<< ", " << name << ")");
......@@ -639,8 +649,9 @@ Debug_glXQueryServerString(Display* dpy, int screen, int name) {
return result;
}
static int GL_BINDING_CALL
Debug_glXQueryVersion(Display* dpy, int* maj, int* min) {
static int GL_BINDING_CALL Debug_glXQueryVersion(Display* dpy,
int* maj,
int* min) {
GL_SERVICE_LOG("glXQueryVersion"
<< "(" << static_cast<const void*>(dpy) << ", "
<< static_cast<const void*>(maj) << ", "
......@@ -650,32 +661,35 @@ Debug_glXQueryVersion(Display* dpy, int* maj, int* min) {
return result;
}
static void GL_BINDING_CALL
Debug_glXReleaseTexImageEXT(Display* dpy, GLXDrawable drawable, int buffer) {
static void GL_BINDING_CALL Debug_glXReleaseTexImageEXT(Display* dpy,
GLXDrawable drawable,
int buffer) {
GL_SERVICE_LOG("glXReleaseTexImageEXT"
<< "(" << static_cast<const void*>(dpy) << ", " << drawable
<< ", " << buffer << ")");
g_driver_glx.debug_fn.glXReleaseTexImageEXTFn(dpy, drawable, buffer);
}
static void GL_BINDING_CALL
Debug_glXSelectEvent(Display* dpy, GLXDrawable drawable, unsigned long mask) {
static void GL_BINDING_CALL Debug_glXSelectEvent(Display* dpy,
GLXDrawable drawable,
unsigned long mask) {
GL_SERVICE_LOG("glXSelectEvent"
<< "(" << static_cast<const void*>(dpy) << ", " << drawable
<< ", " << mask << ")");
g_driver_glx.debug_fn.glXSelectEventFn(dpy, drawable, mask);
}
static void GL_BINDING_CALL
Debug_glXSwapBuffers(Display* dpy, GLXDrawable drawable) {
static void GL_BINDING_CALL Debug_glXSwapBuffers(Display* dpy,
GLXDrawable drawable) {
GL_SERVICE_LOG("glXSwapBuffers"
<< "(" << static_cast<const void*>(dpy) << ", " << drawable
<< ")");
g_driver_glx.debug_fn.glXSwapBuffersFn(dpy, drawable);
}
static void GL_BINDING_CALL
Debug_glXSwapIntervalEXT(Display* dpy, GLXDrawable drawable, int interval) {
static void GL_BINDING_CALL Debug_glXSwapIntervalEXT(Display* dpy,
GLXDrawable drawable,
int interval) {
GL_SERVICE_LOG("glXSwapIntervalEXT"
<< "(" << static_cast<const void*>(dpy) << ", " << drawable
<< ", " << interval << ")");
......@@ -688,8 +702,10 @@ static void GL_BINDING_CALL Debug_glXSwapIntervalMESA(unsigned int interval) {
g_driver_glx.debug_fn.glXSwapIntervalMESAFn(interval);
}
static void GL_BINDING_CALL
Debug_glXUseXFont(Font font, int first, int count, int list) {
static void GL_BINDING_CALL Debug_glXUseXFont(Font font,
int first,
int count,
int list) {
GL_SERVICE_LOG("glXUseXFont"
<< "(" << font << ", " << first << ", " << count << ", "
<< list << ")");
......@@ -703,8 +719,9 @@ static void GL_BINDING_CALL Debug_glXWaitGL(void) {
g_driver_glx.debug_fn.glXWaitGLFn();
}
static int GL_BINDING_CALL
Debug_glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int* count) {
static int GL_BINDING_CALL Debug_glXWaitVideoSyncSGI(int divisor,
int remainder,
unsigned int* count) {
GL_SERVICE_LOG("glXWaitVideoSyncSGI"
<< "(" << divisor << ", " << remainder << ", "
<< static_cast<const void*>(count) << ")");
......
ui/gl/gl_bindings_autogen_mock.cc
浏览文件 @ 2c1db4b8
此差异已折叠。
ui/gl/gl_bindings_autogen_mock.h
浏览文件 @ 2c1db4b8
此差异已折叠。
ui/gl/gl_bindings_skia_in_process.cc
浏览文件 @ 2c1db4b8
......@@ -64,6 +64,10 @@ GLvoid StubGLBindVertexArray(GLuint array) {
glBindVertexArrayOES(array);
}
GLvoid StubGLBlendBarrier(void) {
glBlendBarrierKHR();
}
GLvoid StubGLBlendColor(GLclampf red, GLclampf green, GLclampf blue,
GLclampf alpha) {
glBlendColor(red, green, blue, alpha);
......@@ -657,6 +661,44 @@ GLint StubGLGetProgramResourceLocation(GLuint program,
return glGetProgramResourceLocation(program, programInterface, name);
}
GLvoid StubGLDebugMessageControl(GLenum source, GLenum type, GLenum severity,
GLsizei count, const GLuint *ids,
GLboolean enabled) {
glDebugMessageControlKHR(source, type, severity, count, ids, enabled);
}
GLvoid StubGLDebugMessageInsert(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei length,
const GLchar *buf) {
glDebugMessageInsertKHR(source, type, id, severity, length, buf);
}
GLvoid StubGLDebugMessageCallback(GLDEBUGPROCKHR callback,
const void *userParam) {
glDebugMessageCallbackKHR(callback, userParam);
}
GLuint StubGLGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources,
GLenum *types, GLuint *ids, GLenum *severities,
GLsizei *lengths, GLchar *messageLog) {
return glGetDebugMessageLogKHR(count, bufSize, sources, types, ids,
severities, lengths, messageLog);
}
GLvoid StubGLPushDebugGroup(GLenum source, GLuint id, GLsizei length,
const GLchar *message) {
glPushDebugGroupKHR(source, id, length, message);
}
GLvoid StubGLPopDebugGroup(void) {
glPopDebugGroupKHR();
}
GLvoid StubGLObjectLabel(GLenum identifier, GLuint name, GLsizei length,
const GLchar *label) {
glObjectLabelKHR(identifier, name, length, label);
}
} // extern "C"
} // namespace
......@@ -706,6 +748,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
functions->fBindFragDataLocation = StubGLBindFragDataLocation;
functions->fBindTexture = StubGLBindTexture;
functions->fBindVertexArray = StubGLBindVertexArray;
functions->fBlendBarrier = StubGLBlendBarrier;
functions->fBlendColor = StubGLBlendColor;
functions->fBlendEquation = StubGLBlendEquation;
functions->fBlendFunc = StubGLBlendFunc;
......@@ -847,6 +890,14 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
functions->fBindFragDataLocationIndexed =
StubGLBindFragDataLocationIndexed;
functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation;
functions->fDebugMessageControl = StubGLDebugMessageControl;
functions->fDebugMessageInsert = StubGLDebugMessageInsert;
functions->fDebugMessageCallback =
reinterpret_cast<GrGLDebugMessageCallbackProc>(StubGLDebugMessageCallback);
functions->fGetDebugMessageLog = StubGLGetDebugMessageLog;
functions->fPushDebugGroup = StubGLPushDebugGroup;
functions->fPopDebugGroup = StubGLPopDebugGroup;
functions->fObjectLabel = StubGLObjectLabel;
return interface;
}
......
ui/gl/gl_mock_autogen_gl.h
浏览文件 @ 2c1db4b8
......@@ -169,6 +169,22 @@ MOCK_METHOD9(CopyTexSubImage3D,
MOCK_METHOD0(CreateProgram, GLuint());
MOCK_METHOD1(CreateShader, GLuint(GLenum type));
MOCK_METHOD1(CullFace, void(GLenum mode));
MOCK_METHOD2(DebugMessageCallbackKHR,
void(GLDEBUGPROCKHR callback, const void* userparam));
MOCK_METHOD6(DebugMessageControlKHR,
void(GLenum source,
GLenum type,
GLenum severity,
GLsizei count,
const GLuint* ids,
GLboolean enabled));
MOCK_METHOD6(DebugMessageInsertKHR,
void(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const GLchar* buf));
MOCK_METHOD2(DeleteBuffersARB, void(GLsizei n, const GLuint* buffers));
MOCK_METHOD2(DeleteFencesAPPLE, void(GLsizei n, const GLuint* fences));
MOCK_METHOD2(DeleteFencesNV, void(GLsizei n, const GLuint* fences));
......@@ -314,6 +330,15 @@ MOCK_METHOD2(GetAttribLocation, GLint(GLuint program, const char* name));
MOCK_METHOD2(GetBooleanv, void(GLenum pname, GLboolean* params));
MOCK_METHOD3(GetBufferParameteriv,
void(GLenum target, GLenum pname, GLint* params));
MOCK_METHOD8(GetDebugMessageLogKHR,
GLuint(GLuint count,
GLsizei bufSize,
GLenum* sources,
GLenum* types,
GLuint* ids,
GLenum* severities,
GLsizei* lengths,
GLchar* messageLog));
MOCK_METHOD0(GetError, GLenum());
MOCK_METHOD3(GetFenceivNV, void(GLuint fence, GLenum pname, GLint* params));
MOCK_METHOD2(GetFloatv, void(GLenum pname, GLfloat* params));
......@@ -451,10 +476,14 @@ MOCK_METHOD4(MapBufferRange,
GLbitfield access));
MOCK_METHOD2(MatrixLoadfEXT, void(GLenum matrixMode, const GLfloat* m));
MOCK_METHOD1(MatrixLoadIdentityEXT, void(GLenum matrixMode));
MOCK_METHOD4(
ObjectLabelKHR,
void(GLenum identifier, GLuint name, GLsizei length, const GLchar* label));
MOCK_METHOD0(PauseTransformFeedback, void());
MOCK_METHOD2(PixelStorei, void(GLenum pname, GLint param));
MOCK_METHOD2(PointParameteri, void(GLenum pname, GLint param));
MOCK_METHOD2(PolygonOffset, void(GLfloat factor, GLfloat units));
MOCK_METHOD0(PopDebugGroupKHR, void());
MOCK_METHOD0(PopGroupMarkerEXT, void());
MOCK_METHOD4(ProgramBinary,
void(GLuint program,
......@@ -463,6 +492,9 @@ MOCK_METHOD4(ProgramBinary,
GLsizei length));
MOCK_METHOD3(ProgramParameteri,
void(GLuint program, GLenum pname, GLint value));
MOCK_METHOD4(
PushDebugGroupKHR,
void(GLenum source, GLuint id, GLsizei length, const GLchar* message));
MOCK_METHOD2(PushGroupMarkerEXT, void(GLsizei length, const char* marker));
MOCK_METHOD2(QueryCounter, void(GLuint id, GLenum target));
MOCK_METHOD1(ReadBuffer, void(GLenum src));
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或