brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Move some GL function pointers from in-gles-core to core

Browse Source 
Now that we require GLES2 or GL 2.1 these are always available.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/866
This commit is contained in:
Adam Jackson 2019-10-17 16:47:15 -04:00 committed by Georges Basile Stavracas Neto
parent 82f56054d4
commit d810c0576d
3 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cogl/cogl/driver/gl/gl/cogl-driver-gl.c
View File

@ -444,15 +444,10 @@ _cogl_driver_update_features (CoglContext *ctx,
flags |= COGL_FEATURE_POINT_SPRITE; flags |= COGL_FEATURE_POINT_SPRITE;
COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_POINT_SPRITE, TRUE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_POINT_SPRITE, TRUE);
if (ctx->glGenBuffers) flags |= (COGL_FEATURE_MAP_BUFFER_FOR_READ |
{ COGL_FEATURE_MAP_BUFFER_FOR_WRITE);
flags |= (COGL_FEATURE_MAP_BUFFER_FOR_READ | COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE);
COGL_FEATURE_MAP_BUFFER_FOR_WRITE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE);
}
if (ctx->glEGLImageTargetTexture2D) if (ctx->glEGLImageTargetTexture2D)
COGL_FLAGS_SET (private_features, COGL_FLAGS_SET (private_features,

25
cogl/cogl/gl-prototypes/cogl-core-functions.h
View File

@ -63,10 +63,25 @@ COGL_EXT_BEGIN (core,
COGL_EXT_IN_GLES2, COGL_EXT_IN_GLES2,
"\0", "\0",
"\0") "\0")
COGL_EXT_FUNCTION (void, glActiveTexture,
(GLenum texture))
COGL_EXT_FUNCTION (void, glBindBuffer,
(GLenum target,
GLuint buffer))
COGL_EXT_FUNCTION (void, glBindTexture, COGL_EXT_FUNCTION (void, glBindTexture,
(GLenum target, GLuint texture)) (GLenum target, GLuint texture))
COGL_EXT_FUNCTION (void, glBlendFunc, COGL_EXT_FUNCTION (void, glBlendFunc,
(GLenum sfactor, GLenum dfactor)) (GLenum sfactor, GLenum dfactor))
COGL_EXT_FUNCTION (void, glBufferData,
(GLenum target,
GLsizeiptr size,
const GLvoid *data,
GLenum usage))
COGL_EXT_FUNCTION (void, glBufferSubData,
(GLenum target,
GLintptr offset,
GLsizeiptr size,
const GLvoid *data))
COGL_EXT_FUNCTION (void, glClear, COGL_EXT_FUNCTION (void, glClear,
(GLbitfield mask)) (GLbitfield mask))
COGL_EXT_FUNCTION (void, glClearColor, COGL_EXT_FUNCTION (void, glClearColor,
@ -90,6 +105,9 @@ COGL_EXT_FUNCTION (void, glCopyTexSubImage2D,
GLint y, GLint y,
GLsizei width, GLsizei width,
GLsizei height)) GLsizei height))
COGL_EXT_FUNCTION (void, glDeleteBuffers,
(GLsizei n,
const GLuint *buffers))
COGL_EXT_FUNCTION (void, glDeleteTextures, COGL_EXT_FUNCTION (void, glDeleteTextures,
(GLsizei n, const GLuint* textures)) (GLsizei n, const GLuint* textures))
COGL_EXT_FUNCTION (void, glDepthFunc, COGL_EXT_FUNCTION (void, glDepthFunc,
@ -115,8 +133,13 @@ COGL_EXT_FUNCTION (void, glFrontFace,
(GLenum mode)) (GLenum mode))
COGL_EXT_FUNCTION (void, glCullFace, COGL_EXT_FUNCTION (void, glCullFace,
(GLenum mode)) (GLenum mode))
COGL_EXT_FUNCTION (void, glGenBuffers,
(GLsizei n,
GLuint *buffers))
COGL_EXT_FUNCTION (void, glGenTextures, COGL_EXT_FUNCTION (void, glGenTextures,
(GLsizei n, GLuint* textures)) (GLsizei n, GLuint* textures))
COGL_EXT_FUNCTION (void, glGetBufferParameteriv,
(GLenum target, GLenum pname, GLint* params))
COGL_EXT_FUNCTION (GLenum, glGetError, COGL_EXT_FUNCTION (GLenum, glGetError,
(void)) (void))
COGL_EXT_FUNCTION (void, glGetIntegerv, COGL_EXT_FUNCTION (void, glGetIntegerv,
@ -129,6 +152,8 @@ COGL_EXT_FUNCTION (const GLubyte*, glGetString,
(GLenum name)) (GLenum name))
COGL_EXT_FUNCTION (void, glHint, COGL_EXT_FUNCTION (void, glHint,
(GLenum target, GLenum mode)) (GLenum target, GLenum mode))
COGL_EXT_FUNCTION (GLboolean, glIsBuffer,
(GLuint buffer))
COGL_EXT_FUNCTION (GLboolean, glIsTexture, COGL_EXT_FUNCTION (GLboolean, glIsTexture,
(GLuint texture)) (GLuint texture))
COGL_EXT_FUNCTION (void, glPixelStorei, COGL_EXT_FUNCTION (void, glPixelStorei,

47
cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
View File

@ -66,50 +66,3 @@ COGL_EXT_FUNCTION (void, glDepthRangef,
COGL_EXT_FUNCTION (void, glClearDepthf, COGL_EXT_FUNCTION (void, glClearDepthf,
(GLclampf depth)) (GLclampf depth))
COGL_EXT_END () COGL_EXT_END ()
COGL_EXT_BEGIN (only_in_both_gles_and_gl_1_5,
1, 5,
COGL_EXT_IN_GLES2,
"\0",
"\0")
COGL_EXT_FUNCTION (void, glGetBufferParameteriv,
(GLenum target, GLenum pname, GLint* params))
COGL_EXT_END ()
COGL_EXT_BEGIN (vbos, 1, 5,
COGL_EXT_IN_GLES2,
"ARB\0",
"vertex_buffer_object\0")
COGL_EXT_FUNCTION (void, glGenBuffers,
(GLsizei n,
GLuint *buffers))
COGL_EXT_FUNCTION (void, glBindBuffer,
(GLenum target,
GLuint buffer))
COGL_EXT_FUNCTION (void, glBufferData,
(GLenum target,
GLsizeiptr size,
const GLvoid *data,
GLenum usage))
COGL_EXT_FUNCTION (void, glBufferSubData,
(GLenum target,
GLintptr offset,
GLsizeiptr size,
const GLvoid *data))
COGL_EXT_FUNCTION (void, glDeleteBuffers,
(GLsizei n,
const GLuint *buffers))
COGL_EXT_FUNCTION (GLboolean, glIsBuffer,
(GLuint buffer))
COGL_EXT_END ()
/* Available in GL 1.3, the multitexture extension or GLES. These are
required */
COGL_EXT_BEGIN (multitexture_part0, 1, 3,
COGL_EXT_IN_GLES2,
"ARB\0",
"multitexture\0")
COGL_EXT_FUNCTION (void, glActiveTexture,
(GLenum texture))
COGL_EXT_END ()