From d96b24bd2e3359f4295d4b44b811d60d1e874836 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 14 Feb 2007 00:13:42 +0000 Subject: [PATCH] shader bindings --- stepmania/src/RageDisplay_OGL_Helpers.cpp | 3 +++ stepmania/src/RageDisplay_OGL_Helpers.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageDisplay_OGL_Helpers.cpp b/stepmania/src/RageDisplay_OGL_Helpers.cpp index 146748f3c6..73925fd8ad 100644 --- a/stepmania/src/RageDisplay_OGL_Helpers.cpp +++ b/stepmania/src/RageDisplay_OGL_Helpers.cpp @@ -180,6 +180,8 @@ void GLExt_t::Load( LowLevelWindow *pWind ) F( glEnableVertexAttribArrayARB ), F( glDisableVertexAttribArrayARB ), F( glVertexAttribPointerARB ), + F( glGetUniformLocationARB ), + F( glUniform1iARB ), { NULL, NULL } }; @@ -188,6 +190,7 @@ void GLExt_t::Load( LowLevelWindow *pWind ) } m_bGL_ARB_vertex_shader = m_bGL_ARB_shader_objects && HasExtension("GL_ARB_vertex_shader"); + m_bGL_ARB_fragment_shader = m_bGL_ARB_shader_objects && HasExtension("GL_ARB_fragment_shader"); if( m_bGL_ARB_vertex_shader ) { func_t funcs[] = diff --git a/stepmania/src/RageDisplay_OGL_Helpers.h b/stepmania/src/RageDisplay_OGL_Helpers.h index 834aaab038..6d795c031c 100644 --- a/stepmania/src/RageDisplay_OGL_Helpers.h +++ b/stepmania/src/RageDisplay_OGL_Helpers.h @@ -98,9 +98,12 @@ struct GLExt_t PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB; PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB; PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB; + PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB; + PFNGLUNIFORM1IARBPROC glUniform1iARB; - // GL_ARB_vertex_shader: + // GL_ARB_vertex_shader and GL_ARB_fragment_shader: bool m_bGL_ARB_vertex_shader; + bool m_bGL_ARB_fragment_shader; PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB; bool m_bGL_ARB_shading_language_100;