Browse Source

Merge pull request #84 from Yahor10/master

glUniform2f
Denis Muratshin 9 years ago
parent
commit
f3631baf2e
2 changed files with 6 additions and 0 deletions
  1. 4 0
      oxygine/src/core/gl/oxgl.cpp
  2. 2 0
      oxygine/src/core/gl/oxgl.h

+ 4 - 0
oxygine/src/core/gl/oxgl.cpp

@@ -66,6 +66,8 @@ extern "C"
     {}
     {}
     GLAPI void APIENTRY def_glUniform1i(GLint location, GLint v0)
     GLAPI void APIENTRY def_glUniform1i(GLint location, GLint v0)
     {}
     {}
+	GLAPI void APIENTRY def_glUniform2f(GLint location, GLfloat v0, GLfloat v1)
+	{}
     GLAPI void APIENTRY def_glUniform2fv(GLint location, GLsizei count, const GLfloat* value)
     GLAPI void APIENTRY def_glUniform2fv(GLint location, GLsizei count, const GLfloat* value)
     {}
     {}
     GLAPI void APIENTRY def_glUniform3fv(GLint location, GLsizei count, const GLfloat* value)
     GLAPI void APIENTRY def_glUniform3fv(GLint location, GLsizei count, const GLfloat* value)
@@ -143,6 +145,7 @@ extern "C"
     PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation = 0;
     PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation = 0;
     PFNGLLINKPROGRAMPROC _glLinkProgram = 0;
     PFNGLLINKPROGRAMPROC _glLinkProgram = 0;
     PFNGLUNIFORM1IPROC _glUniform1i = 0;
     PFNGLUNIFORM1IPROC _glUniform1i = 0;
+	PFNGLUNIFORM2FPROC _glUniform2f = 0;
     PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
     PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
     PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
     PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
     PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
     PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
@@ -195,6 +198,7 @@ int initGLExtensions(myGetProcAdress func)
     GETFUNC(_glGetAttribLocation, def_glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC, "glGetAttribLocation");
     GETFUNC(_glGetAttribLocation, def_glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC, "glGetAttribLocation");
     GETFUNC(_glLinkProgram, def_glLinkProgram, PFNGLLINKPROGRAMPROC, "glLinkProgram");
     GETFUNC(_glLinkProgram, def_glLinkProgram, PFNGLLINKPROGRAMPROC, "glLinkProgram");
     GETFUNC(_glUniform1i, def_glUniform1i, PFNGLUNIFORM1IPROC, "glUniform1i");
     GETFUNC(_glUniform1i, def_glUniform1i, PFNGLUNIFORM1IPROC, "glUniform1i");
+	GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
     GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
     GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
     GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
     GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
     GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");
     GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");

+ 2 - 0
oxygine/src/core/gl/oxgl.h

@@ -43,6 +43,7 @@ extern "C"
     extern PFNGLLINKPROGRAMPROC _glLinkProgram;
     extern PFNGLLINKPROGRAMPROC _glLinkProgram;
     extern PFNGLUNIFORM1IPROC _glUniform1i;
     extern PFNGLUNIFORM1IPROC _glUniform1i;
     extern PFNGLUNIFORM2FVPROC _glUniform2fv;
     extern PFNGLUNIFORM2FVPROC _glUniform2fv;
+	extern PFNGLUNIFORM2FPROC _glUniform2f;
     extern PFNGLUNIFORM3FVPROC _glUniform3fv;
     extern PFNGLUNIFORM3FVPROC _glUniform3fv;
     extern PFNGLUNIFORM4FVPROC _glUniform4fv;
     extern PFNGLUNIFORM4FVPROC _glUniform4fv;
     extern PFNGLUNIFORM1FPROC _glUniform1f;
     extern PFNGLUNIFORM1FPROC _glUniform1f;
@@ -140,6 +141,7 @@ extern "C"
 #define oxglLinkProgram DECLARE_GLEXT(glLinkProgram)
 #define oxglLinkProgram DECLARE_GLEXT(glLinkProgram)
 #define oxglUniform1i DECLARE_GLEXT(glUniform1i)
 #define oxglUniform1i DECLARE_GLEXT(glUniform1i)
 #define oxglUniform2fv DECLARE_GLEXT(glUniform2fv)
 #define oxglUniform2fv DECLARE_GLEXT(glUniform2fv)
+#define oxglUniform2f DECLARE_GLEXT(glUniform2f)
 #define oxglUniform3fv DECLARE_GLEXT(glUniform3fv)
 #define oxglUniform3fv DECLARE_GLEXT(glUniform3fv)
 #define oxglUniform4fv DECLARE_GLEXT(glUniform4fv)
 #define oxglUniform4fv DECLARE_GLEXT(glUniform4fv)
 #define oxglUniform1f DECLARE_GLEXT(glUniform1f)
 #define oxglUniform1f DECLARE_GLEXT(glUniform1f)