[vlc-commits] video_output: opengl: add more glUniform* vtable entries
Niklas Haas
git at videolan.org
Fri Nov 3 11:11:45 CET 2017
vlc | branch: master | Niklas Haas <git at haasn.xyz> | Tue Oct 31 22:03:41 2017 +0100| [f023eb4bfa550174cdead9dfd53641179ef60fa1] | committer: Thomas Guillem
video_output: opengl: add more glUniform* vtable entries
These are needed to support some of the missing matrix types that
libplacebo uses.
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f023eb4bfa550174cdead9dfd53641179ef60fa1
---
modules/video_output/opengl/converter.h | 8 ++++++++
modules/video_output/opengl/vout_helper.c | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
index 3acbf6911d..4be26b573d 100644
--- a/modules/video_output/opengl/converter.h
+++ b/modules/video_output/opengl/converter.h
@@ -64,9 +64,13 @@ typedef void (APIENTRY *PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size,
# define PFNGLVERTEXATTRIBPOINTERPROC typeof(glVertexAttribPointer)*
# define PFNGLENABLEVERTEXATTRIBARRAYPROC typeof(glEnableVertexAttribArray)*
# define PFNGLUNIFORMMATRIX4FVPROC typeof(glUniformMatrix4fv)*
+# define PFNGLUNIFORMMATRIX3FVPROC typeof(glUniformMatrix3fv)*
+# define PFNGLUNIFORMMATRIX2FVPROC typeof(glUniformMatrix2fv)*
# define PFNGLUNIFORM4FVPROC typeof(glUniform4fv)*
# define PFNGLUNIFORM4FPROC typeof(glUniform4f)*
+# define PFNGLUNIFORM3FPROC typeof(glUniform3f)*
# define PFNGLUNIFORM2FPROC typeof(glUniform2f)*
+# define PFNGLUNIFORM1FPROC typeof(glUniform1f)*
# define PFNGLUNIFORM1IPROC typeof(glUniform1i)*
# define PFNGLCREATESHADERPROC typeof(glCreateShader)*
# define PFNGLSHADERSOURCEPROC typeof(glShaderSource)*
@@ -144,9 +148,13 @@ typedef struct {
PFNGLVERTEXATTRIBPOINTERPROC VertexAttribPointer;
PFNGLENABLEVERTEXATTRIBARRAYPROC EnableVertexAttribArray;
PFNGLUNIFORMMATRIX4FVPROC UniformMatrix4fv;
+ PFNGLUNIFORMMATRIX3FVPROC UniformMatrix3fv;
+ PFNGLUNIFORMMATRIX2FVPROC UniformMatrix2fv;
PFNGLUNIFORM4FVPROC Uniform4fv;
PFNGLUNIFORM4FPROC Uniform4f;
+ PFNGLUNIFORM3FPROC Uniform3f;
PFNGLUNIFORM2FPROC Uniform2f;
+ PFNGLUNIFORM1FPROC Uniform1f;
PFNGLUNIFORM1IPROC Uniform1i;
/* Program commands */
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index e2491546f1..4c9b9fd22b 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -758,9 +758,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
GET_PROC_ADDR(VertexAttribPointer);
GET_PROC_ADDR(EnableVertexAttribArray);
GET_PROC_ADDR(UniformMatrix4fv);
+ GET_PROC_ADDR(UniformMatrix3fv);
+ GET_PROC_ADDR(UniformMatrix2fv);
GET_PROC_ADDR(Uniform4fv);
GET_PROC_ADDR(Uniform4f);
+ GET_PROC_ADDR(Uniform3f);
GET_PROC_ADDR(Uniform2f);
+ GET_PROC_ADDR(Uniform1f);
GET_PROC_ADDR(Uniform1i);
GET_PROC_ADDR(CreateProgram);
More information about the vlc-commits
mailing list