[mutter] cogl: Remove unused GL imports from the CoglContext vtable
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove unused GL imports from the CoglContext vtable
- Date: Thu, 16 Jan 2020 18:55:09 +0000 (UTC)
commit 347619a85f231d234a8f0d608a19fac314a6e983
Author: Adam Jackson <ajax redhat com>
Date: Mon Oct 21 13:55:46 2019 -0400
cogl: Remove unused GL imports from the CoglContext vtable
Notably this deletes cogl-fixed-functions.h since we are no longer using
any of the GL1-style fixed-function pipeline API.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/995
cogl/cogl/gl-prototypes/cogl-all-functions.h | 46 ---------
cogl/cogl/gl-prototypes/cogl-core-functions.h | 30 ------
cogl/cogl/gl-prototypes/cogl-fixed-functions.h | 115 ---------------------
cogl/cogl/gl-prototypes/cogl-glsl-functions.h | 82 ---------------
.../gl-prototypes/cogl-in-gles-core-functions.h | 2 -
.../gl-prototypes/cogl-in-gles2-core-functions.h | 41 --------
cogl/cogl/meson.build | 1 -
7 files changed, 317 deletions(-)
---
diff --git a/cogl/cogl/gl-prototypes/cogl-all-functions.h b/cogl/cogl/gl-prototypes/cogl-all-functions.h
index ca32a3a12..512b6d4ce 100644
--- a/cogl/cogl/gl-prototypes/cogl-all-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-all-functions.h
@@ -68,9 +68,6 @@
* to GL but they may be extensions available for GL */
#include "cogl-in-gles-core-functions.h"
-/* These are fixed-function APIs core to GL and GLES1 */
-#include "cogl-fixed-functions.h"
-
/* These are GLSL shader APIs core to GL 2.0 and GLES2 */
#include "cogl-glsl-functions.h"
@@ -88,8 +85,6 @@ COGL_EXT_FUNCTION (void, glGetTexImage,
(GLenum target, GLint level,
GLenum format, GLenum type,
GLvoid *pixels))
-COGL_EXT_FUNCTION (void, glClipPlane,
- (GLenum plane, const double *equation))
COGL_EXT_FUNCTION (void, glDepthRange,
(double near_val, double far_val))
COGL_EXT_FUNCTION (void, glDrawBuffer,
@@ -135,9 +130,6 @@ COGL_EXT_BEGIN (EGL_image, 255, 255,
COGL_EXT_FUNCTION (void, glEGLImageTargetTexture2D,
(GLenum target,
GLeglImageOES image))
-COGL_EXT_FUNCTION (void, glEGLImageTargetRenderbufferStorage,
- (GLenum target,
- GLeglImageOES image))
COGL_EXT_END ()
COGL_EXT_BEGIN (framebuffer_discard, 255, 255,
@@ -188,41 +180,6 @@ COGL_EXT_FUNCTION (void, glSamplerParameteri,
GLint param))
COGL_EXT_END ()
-/* These only list functions that come from the old GLSL extensions.
- * Functions that are common to the extensions and GLSL 2.0 should
- * instead be listed in cogl-glsl-functions.h */
-COGL_EXT_BEGIN (shader_objects, 255, 255,
- 0, /* not in either GLES */
- "ARB\0",
- "shader_objects\0")
-COGL_EXT_FUNCTION (GLuint, glCreateProgramObject,
- (void))
-COGL_EXT_FUNCTION (GLuint, glCreateShaderObject,
- (GLenum shaderType))
-COGL_EXT_FUNCTION (void, glDeleteObject,
- (GLuint obj))
-COGL_EXT_FUNCTION (void, glAttachObject,
- (GLuint container, GLuint obj))
-COGL_EXT_FUNCTION (void, glUseProgramObject,
- (GLuint programObj))
-COGL_EXT_FUNCTION (void, glGetInfoLog,
- (GLuint obj,
- GLsizei maxLength,
- GLsizei *length,
- char *infoLog))
-COGL_EXT_FUNCTION (void, glGetObjectParameteriv,
- (GLuint obj,
- GLenum pname,
- GLint *params))
-COGL_EXT_FUNCTION (void, glDetachObject,
- (GLuint container, GLuint obj))
-COGL_EXT_FUNCTION (void, glGetAttachedObjects,
- (GLuint program,
- GLsizei maxcount,
- GLsizei* count,
- GLuint* shaders))
-COGL_EXT_END ()
-
COGL_EXT_BEGIN (only_gl3, 3, 0,
0, /* not in either GLES */
"\0",
@@ -237,9 +194,6 @@ COGL_EXT_BEGIN (vertex_array_object, 3, 0,
"vertex_array_object\0")
COGL_EXT_FUNCTION (void, glBindVertexArray,
(GLuint array))
-COGL_EXT_FUNCTION (void, glDeleteVertexArrays,
- (GLsizei n,
- const GLuint *arrays))
COGL_EXT_FUNCTION (void, glGenVertexArrays,
(GLsizei n,
GLuint *arrays))
diff --git a/cogl/cogl/gl-prototypes/cogl-core-functions.h b/cogl/cogl/gl-prototypes/cogl-core-functions.h
index 0236096c5..e04b443ae 100644
--- a/cogl/cogl/gl-prototypes/cogl-core-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-core-functions.h
@@ -136,22 +136,12 @@ COGL_EXT_FUNCTION (void, glGenBuffers,
GLuint *buffers))
COGL_EXT_FUNCTION (void, glGenTextures,
(GLsizei n, GLuint* textures))
-COGL_EXT_FUNCTION (void, glGetBufferParameteriv,
- (GLenum target, GLenum pname, GLint* params))
COGL_EXT_FUNCTION (GLenum, glGetError,
(void))
COGL_EXT_FUNCTION (void, glGetIntegerv,
(GLenum pname, GLint* params))
-COGL_EXT_FUNCTION (void, glGetBooleanv,
- (GLenum pname, GLboolean* params))
-COGL_EXT_FUNCTION (void, glGetFloatv,
- (GLenum pname, GLfloat* params))
COGL_EXT_FUNCTION (const GLubyte*, glGetString,
(GLenum name))
-COGL_EXT_FUNCTION (void, glHint,
- (GLenum target, GLenum mode))
-COGL_EXT_FUNCTION (GLboolean, glIsBuffer,
- (GLuint buffer))
COGL_EXT_FUNCTION (GLboolean, glIsTexture,
(GLuint texture))
COGL_EXT_FUNCTION (void, glPixelStorei,
@@ -182,18 +172,10 @@ COGL_EXT_FUNCTION (void, glTexImage2D,
GLenum format,
GLenum type,
const GLvoid* pixels))
-COGL_EXT_FUNCTION (void, glTexParameterf,
- (GLenum target, GLenum pname, GLfloat param))
-COGL_EXT_FUNCTION (void, glTexParameterfv,
- (GLenum target, GLenum pname, const GLfloat* params))
COGL_EXT_FUNCTION (void, glTexParameteri,
(GLenum target, GLenum pname, GLint param))
COGL_EXT_FUNCTION (void, glTexParameteriv,
(GLenum target, GLenum pname, const GLint* params))
-COGL_EXT_FUNCTION (void, glGetTexParameterfv,
- (GLenum target, GLenum pname, GLfloat* params))
-COGL_EXT_FUNCTION (void, glGetTexParameteriv,
- (GLenum target, GLenum pname, GLint* params))
COGL_EXT_FUNCTION (void, glTexSubImage2D,
(GLenum target,
GLint level,
@@ -204,18 +186,6 @@ COGL_EXT_FUNCTION (void, glTexSubImage2D,
GLenum format,
GLenum type,
const GLvoid* pixels))
-COGL_EXT_FUNCTION (void, glCopyTexImage2D,
- (GLenum target,
- GLint level,
- GLenum internalformat,
- GLint x,
- GLint y,
- GLsizei width,
- GLsizei height,
- GLint border))
COGL_EXT_FUNCTION (void, glViewport,
(GLint x, GLint y, GLsizei width, GLsizei height))
-COGL_EXT_FUNCTION (GLboolean, glIsEnabled, (GLenum cap))
-COGL_EXT_FUNCTION (void, glLineWidth, (GLfloat width))
-COGL_EXT_FUNCTION (void, glPolygonOffset, (GLfloat factor, GLfloat units))
COGL_EXT_END ()
diff --git a/cogl/cogl/gl-prototypes/cogl-glsl-functions.h b/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
index 980f8adf0..a918ad866 100644
--- a/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
@@ -93,17 +93,6 @@ COGL_EXT_FUNCTION (void, glGetProgramiv,
(GLuint program,
GLenum pname,
GLint *params))
-COGL_EXT_FUNCTION (void, glDetachShader,
- (GLuint program, GLuint shader))
-COGL_EXT_FUNCTION (void, glGetAttachedShaders,
- (GLuint program,
- GLsizei maxcount,
- GLsizei* count,
- GLuint* shaders))
-COGL_EXT_FUNCTION (GLboolean, glIsShader,
- (GLuint shader))
-COGL_EXT_FUNCTION (GLboolean, glIsProgram,
- (GLuint program))
COGL_EXT_END ()
/* These functions are provided by GL_ARB_shader_objects or are in GL
@@ -127,21 +116,6 @@ COGL_EXT_FUNCTION (GLint, glGetUniformLocation,
COGL_EXT_FUNCTION (void, glUniform1f,
(GLint location,
GLfloat v0))
-COGL_EXT_FUNCTION (void, glUniform2f,
- (GLint location,
- GLfloat v0,
- GLfloat v1))
-COGL_EXT_FUNCTION (void, glUniform3f,
- (GLint location,
- GLfloat v0,
- GLfloat v1,
- GLfloat v2))
-COGL_EXT_FUNCTION (void, glUniform4f,
- (GLint location,
- GLfloat v0,
- GLfloat v1,
- GLfloat v2,
- GLfloat v3))
COGL_EXT_FUNCTION (void, glUniform1fv,
(GLint location,
GLsizei count,
@@ -161,21 +135,6 @@ COGL_EXT_FUNCTION (void, glUniform4fv,
COGL_EXT_FUNCTION (void, glUniform1i,
(GLint location,
GLint v0))
-COGL_EXT_FUNCTION (void, glUniform2i,
- (GLint location,
- GLint v0,
- GLint v1))
-COGL_EXT_FUNCTION (void, glUniform3i,
- (GLint location,
- GLint v0,
- GLint v1,
- GLint v2))
-COGL_EXT_FUNCTION (void, glUniform4i,
- (GLint location,
- GLint v0,
- GLint v1,
- GLint v2,
- GLint v3))
COGL_EXT_FUNCTION (void, glUniform1iv,
(GLint location,
GLsizei count,
@@ -207,29 +166,6 @@ COGL_EXT_FUNCTION (void, glUniformMatrix4fv,
GLsizei count,
GLboolean transpose,
const GLfloat *value))
-
-COGL_EXT_FUNCTION (void, glGetUniformfv,
- (GLuint program,
- GLint location,
- GLfloat *params))
-COGL_EXT_FUNCTION (void, glGetUniformiv,
- (GLuint program,
- GLint location,
- GLint *params))
-COGL_EXT_FUNCTION (void, glGetActiveUniform,
- (GLuint program,
- GLuint index,
- GLsizei bufsize,
- GLsizei* length,
- GLint* size,
- GLenum* type,
- GLchar* name))
-COGL_EXT_FUNCTION (void, glGetShaderSource,
- (GLuint shader,
- GLsizei bufsize,
- GLsizei* length,
- GLchar* source))
-COGL_EXT_FUNCTION (void, glValidateProgram, (GLuint program))
COGL_EXT_END ()
/* These functions are provided by GL_ARB_vertex_shader or are in GL
@@ -249,38 +185,20 @@ COGL_EXT_FUNCTION (void, glEnableVertexAttribArray,
(GLuint index))
COGL_EXT_FUNCTION (void, glDisableVertexAttribArray,
(GLuint index))
-COGL_EXT_FUNCTION (void, glVertexAttrib1f, (GLuint indx, GLfloat x))
COGL_EXT_FUNCTION (void, glVertexAttrib1fv,
(GLuint indx, const GLfloat* values))
-COGL_EXT_FUNCTION (void, glVertexAttrib2f, (GLuint indx, GLfloat x, GLfloat y))
COGL_EXT_FUNCTION (void, glVertexAttrib2fv,
(GLuint indx, const GLfloat* values))
-COGL_EXT_FUNCTION (void, glVertexAttrib3f,
- (GLuint indx, GLfloat x, GLfloat y, GLfloat z))
COGL_EXT_FUNCTION (void, glVertexAttrib3fv,
(GLuint indx, const GLfloat* values))
COGL_EXT_FUNCTION (void, glVertexAttrib4f,
(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
COGL_EXT_FUNCTION (void, glVertexAttrib4fv,
(GLuint indx, const GLfloat* values))
-COGL_EXT_FUNCTION (void, glGetVertexAttribfv,
- (GLuint index, GLenum pname, GLfloat* params))
-COGL_EXT_FUNCTION (void, glGetVertexAttribiv,
- (GLuint index, GLenum pname, GLint* params))
-COGL_EXT_FUNCTION (void, glGetVertexAttribPointerv,
- (GLuint index, GLenum pname, GLvoid** pointer))
COGL_EXT_FUNCTION (GLint, glGetAttribLocation,
(GLuint program, const char *name))
COGL_EXT_FUNCTION (void, glBindAttribLocation,
(GLuint program,
GLuint index,
const GLchar* name))
-COGL_EXT_FUNCTION (void, glGetActiveAttrib,
- (GLuint program,
- GLuint index,
- GLsizei bufsize,
- GLsizei* length,
- GLint* size,
- GLenum* type,
- GLchar* name))
COGL_EXT_END ()
diff --git a/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
b/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
index 5c07e43f0..b298bceb8 100644
--- a/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
@@ -63,6 +63,4 @@ COGL_EXT_BEGIN (only_in_both_gles,
"ES2_compatibility\0")
COGL_EXT_FUNCTION (void, glDepthRangef,
(GLfloat near_val, GLfloat far_val))
-COGL_EXT_FUNCTION (void, glClearDepthf,
- (GLclampf depth))
COGL_EXT_END ()
diff --git a/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
b/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
index 33bb4450a..113b99b86 100644
--- a/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
@@ -95,8 +95,6 @@ COGL_EXT_FUNCTION (void, glFramebufferRenderbuffer,
GLenum attachment,
GLenum renderbuffertarget,
GLuint renderbuffer))
-COGL_EXT_FUNCTION (GLboolean, glIsRenderbuffer,
- (GLuint renderbuffer))
COGL_EXT_FUNCTION (GLenum, glCheckFramebufferStatus,
(GLenum target))
COGL_EXT_FUNCTION (void, glDeleteFramebuffers,
@@ -109,12 +107,6 @@ COGL_EXT_FUNCTION (void, glGetFramebufferAttachmentParameteriv,
GLenum attachment,
GLenum pname,
GLint *params))
-COGL_EXT_FUNCTION (void, glGetRenderbufferParameteriv,
- (GLenum target,
- GLenum pname,
- GLint *params))
-COGL_EXT_FUNCTION (GLboolean, glIsFramebuffer,
- (GLuint framebuffer))
COGL_EXT_END ()
COGL_EXT_BEGIN (blending, 1, 2,
@@ -149,36 +141,3 @@ COGL_EXT_FUNCTION (void, glBlendEquationSeparate,
(GLenum modeRGB,
GLenum modeAlpha))
COGL_EXT_END ()
-
-COGL_EXT_BEGIN (gles2_only_api,
- 4, 1,
- COGL_EXT_IN_GLES2,
- "ARB:\0",
- "ES2_compatibility\0")
-COGL_EXT_FUNCTION (void, glReleaseShaderCompiler, (void))
-COGL_EXT_FUNCTION (void, glGetShaderPrecisionFormat,
- (GLenum shadertype,
- GLenum precisiontype,
- GLint* range,
- GLint* precision))
-COGL_EXT_FUNCTION (void, glShaderBinary,
- (GLsizei n,
- const GLuint* shaders,
- GLenum binaryformat,
- const GLvoid* binary,
- GLsizei length))
-COGL_EXT_END ()
-
-/* GL and GLES 2.0 apis */
-COGL_EXT_BEGIN (two_point_zero_api,
- 2, 0,
- COGL_EXT_IN_GLES2,
- "\0",
- "\0")
-COGL_EXT_FUNCTION (void, glStencilFuncSeparate,
- (GLenum face, GLenum func, GLint ref, GLuint mask))
-COGL_EXT_FUNCTION (void, glStencilMaskSeparate,
- (GLenum face, GLuint mask))
-COGL_EXT_FUNCTION (void, glStencilOpSeparate,
- (GLenum face, GLenum fail, GLenum zfail, GLenum zpass))
-COGL_EXT_END ()
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 10f84aa7b..b9ff59b75 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -336,7 +336,6 @@ cogl_sources = [
'cogl-poll-private.h',
'cogl-poll.c',
'gl-prototypes/cogl-all-functions.h',
- 'gl-prototypes/cogl-fixed-functions.h',
'cogl-memory-stack-private.h',
'cogl-memory-stack.c',
'cogl-magazine-private.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
