Ivan Safrin 12 лет назад
Родитель
Сommit
f0379ea118

+ 7 - 0
Core/Contents/Source/PolyGLRenderer.cpp

@@ -59,6 +59,9 @@ PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
 PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
 PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
 
+PFNGLGETPROGRAMIVPROC glGetProgramiv;
+PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
+
 // GL_EXT_framebuffer_object
 PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
 PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
@@ -120,6 +123,10 @@ void OpenGLRenderer::initOSSpecific(){
 		glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)wglGetProcAddress("glEnableVertexAttribArrayARB");
 		glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)wglGetProcAddress("glBindAttribLocation");
 
+		
+		glGetProgramiv = (PFNGLGETPROGRAMIVPROC)wglGetProcAddress("glGetProgramiv");
+		glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)wglGetProcAddress("glGetActiveUniform");
+
         glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)wglGetProcAddress("glIsRenderbufferEXT");
         glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)wglGetProcAddress("glBindRenderbufferEXT");
         glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)wglGetProcAddress("glDeleteRenderbuffersEXT");

+ 2 - 0
Core/Contents/Source/PolyGLSLShader.cpp

@@ -41,6 +41,8 @@ using std::vector;
 extern PFNGLUSEPROGRAMPROC glUseProgram;
 extern PFNGLUNIFORM1IPROC glUniform1i;
 extern PFNGLACTIVETEXTUREPROC glActiveTexture;
+extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
+extern PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
 extern PFNGLCREATESHADERPROC glCreateShader;
 extern PFNGLSHADERSOURCEPROC glShaderSource;
 extern PFNGLCOMPILESHADERPROC glCompileShader;

+ 1 - 0
Core/Contents/Source/PolyShader.cpp

@@ -127,6 +127,7 @@ LocalShaderParam * ShaderBinding::addParam(int type, const String& name) {
 	newParam->data = defaultData;
 	newParam->name = name;
 	localParams.push_back(newParam);
+	return newParam;
 }
 
 void ShaderBinding::addRenderTargetBinding(RenderTargetBinding *binding) {