From 17a38a7cdbef52ce75ea074e392ba5f0dfd20554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Mon, 8 Mar 2010 20:38:30 +0000 Subject: [PATCH] Resolve glUniform3fv() and glUniform4fv(). svn path=/trunk/KDE/kdebase/workspace/; revision=1100844 --- lib/kwinglutils_funcs.cpp | 4 ++++ lib/kwinglutils_funcs.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib/kwinglutils_funcs.cpp b/lib/kwinglutils_funcs.cpp index 71ad78c6dc..85018afda1 100644 --- a/lib/kwinglutils_funcs.cpp +++ b/lib/kwinglutils_funcs.cpp @@ -96,6 +96,8 @@ glUniform1f_func glUniform1f; glUniform1i_func glUniform1i; glUniform1fv_func glUniform1fv; glUniform2fv_func glUniform2fv; +glUniform3fv_func glUniform3fv; +glUniform4fv_func glUniform4fv; glValidateProgram_func glValidateProgram; glGetUniformLocation_func glGetUniformLocation; glVertexAttrib1f_func glVertexAttrib1f; @@ -238,6 +240,8 @@ void glResolveFunctions() GL_RESOLVE_WITH_EXT( glUniform1i, glUniform1iARB ); GL_RESOLVE_WITH_EXT( glUniform1fv, glUniform1fvARB ); GL_RESOLVE_WITH_EXT( glUniform2fv, glUniform2fvARB ); + GL_RESOLVE_WITH_EXT( glUniform3fv, glUniform3fvARB ); + GL_RESOLVE_WITH_EXT( glUniform4fv, glUniform4fvARB ); GL_RESOLVE_WITH_EXT( glValidateProgram, glValidateProgramARB ); GL_RESOLVE_WITH_EXT( glGetUniformLocation, glGetUniformLocationARB ); GL_RESOLVE_WITH_EXT( glVertexAttrib1f, glVertexAttrib1fARB ); diff --git a/lib/kwinglutils_funcs.h b/lib/kwinglutils_funcs.h index 329499a238..f064b6ef07 100644 --- a/lib/kwinglutils_funcs.h +++ b/lib/kwinglutils_funcs.h @@ -272,6 +272,7 @@ typedef GLvoid (*glUniform1i_func)(GLint, GLint); typedef GLvoid (*glUniform1fv_func)(GLint, GLsizei, const GLfloat*); typedef GLvoid (*glUniform2fv_func)(GLint, GLsizei, const GLfloat*); typedef GLvoid (*glUniform3fv_func)(GLint, GLsizei, const GLfloat*); +typedef GLvoid (*glUniform4fv_func)(GLint, GLsizei, const GLfloat*); typedef GLvoid (*glValidateProgram_func)(GLuint); typedef GLint (*glGetUniformLocation_func)(GLuint, const GLchar*); typedef GLvoid (*glVertexAttrib1f_func)(GLuint, GLfloat); @@ -298,6 +299,8 @@ extern KWIN_EXPORT glUniform1f_func glUniform1f; extern KWIN_EXPORT glUniform1i_func glUniform1i; extern KWIN_EXPORT glUniform1fv_func glUniform1fv; extern KWIN_EXPORT glUniform2fv_func glUniform2fv; +extern KWIN_EXPORT glUniform3fv_func glUniform3fv; +extern KWIN_EXPORT glUniform4fv_func glUniform4fv; extern KWIN_EXPORT glValidateProgram_func glValidateProgram; extern KWIN_EXPORT glGetUniformLocation_func glGetUniformLocation; extern KWIN_EXPORT glVertexAttrib1f_func glVertexAttrib1f;