mirror of
https://github.com/nigels-com/glew.git
synced 2024-11-13 09:43:48 +00:00
*** empty log message ***
git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@237 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
parent
e86bbd1bf3
commit
055a3884a7
@ -77,7 +77,7 @@ $(I.DEST)/glxew.h: $(EXT)/.dummy
|
|||||||
$(BIN)/make_header.pl '' GLX $(CORE)/GLX_VERSION* >> $@
|
$(BIN)/make_header.pl '' GLX $(CORE)/GLX_VERSION* >> $@
|
||||||
$(BIN)/make_header.pl '' GLX $(EXT)/GLX_* >> $@
|
$(BIN)/make_header.pl '' GLX $(EXT)/GLX_* >> $@
|
||||||
$(BIN)/make_struct.pl GLX $(CORE)/GLX_VERSION* $(EXT)/GLX_* >> $@
|
$(BIN)/make_struct.pl GLX $(CORE)/GLX_VERSION* $(EXT)/GLX_* >> $@
|
||||||
perl -e 's/ GLboolean __GLXEW_VERSION_1_2;/ GLboolean __GLXEW_VERSION_1_0;\n GLboolean __GLXEW_VERSION_1_1;\n GLboolean __GLXEW_VERSION_1_2;/' -pi.bak $@
|
perl -e 's/GLEW_EXPORT GLboolean __GLXEW_VERSION_1_2;/GLEW_EXPORT GLboolean __GLXEW_VERSION_1_0;\nGLEW_EXPORT GLboolean __GLXEW_VERSION_1_1;\nGLEW_EXPORT GLboolean __GLXEW_VERSION_1_2;/' -pi.bak $@
|
||||||
cat $(SRC)/glxew_post.h >> $@
|
cat $(SRC)/glxew_post.h >> $@
|
||||||
$(BIN)/fix_OML_sync_control.sh $@
|
$(BIN)/fix_OML_sync_control.sh $@
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ foreach my $ext (sort @extlist)
|
|||||||
if (keys %$functions)
|
if (keys %$functions)
|
||||||
{
|
{
|
||||||
print "static GLboolean _glewInit_$extname (" . $type .
|
print "static GLboolean _glewInit_$extname (" . $type .
|
||||||
"EW_CONTEXT_ARG_DEF)\n{\n GLboolean r = GL_FALSE;\n";
|
"EW_CONTEXT_ARG_DEF_INIT)\n{\n GLboolean r = GL_FALSE;\n";
|
||||||
output_decls($functions, \&make_pfn_def_init);
|
output_decls($functions, \&make_pfn_def_init);
|
||||||
print "\n return r;\n}\n";
|
print "\n return r;\n}\n";
|
||||||
}
|
}
|
||||||
|
@ -52,11 +52,11 @@ foreach my $ext (sort @extlist)
|
|||||||
{
|
{
|
||||||
if ($extname =~ /WGL_.*/)
|
if ($extname =~ /WGL_.*/)
|
||||||
{
|
{
|
||||||
print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR);\n";
|
print " if (glewExperimental || " . $extvar . "|| crippled) " . $extvar . "= !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR);\n";
|
print " if (glewExperimental || " . $extvar . ") " . $extvar . " = !_glewInit_$extname(GLEW_CONTEXT_ARG_VAR_INIT);\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "#endif /* $extname */\n";
|
print "#endif /* $extname */\n";
|
||||||
|
@ -54,7 +54,7 @@ GLboolean glewGetExtension (const char* name)
|
|||||||
#ifndef GLEW_MX
|
#ifndef GLEW_MX
|
||||||
static
|
static
|
||||||
#endif
|
#endif
|
||||||
GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF)
|
GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
|
||||||
{
|
{
|
||||||
const GLubyte* s;
|
const GLubyte* s;
|
||||||
GLuint i;
|
GLuint i;
|
||||||
|
@ -24,11 +24,11 @@ GLboolean glxewGetExtension (const char* name)
|
|||||||
#ifndef GLEW_MX
|
#ifndef GLEW_MX
|
||||||
static
|
static
|
||||||
#endif
|
#endif
|
||||||
GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF)
|
GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
|
||||||
{
|
{
|
||||||
int major, minor;
|
int major, minor;
|
||||||
/* initialize core GLX 1.2 */
|
/* initialize core GLX 1.2 */
|
||||||
if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
|
if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
|
||||||
/* initialize flags */
|
/* initialize flags */
|
||||||
GLXEW_VERSION_1_0 = GL_FALSE;
|
GLXEW_VERSION_1_0 = GL_FALSE;
|
||||||
GLXEW_VERSION_1_1 = GL_FALSE;
|
GLXEW_VERSION_1_1 = GL_FALSE;
|
||||||
|
@ -98,15 +98,28 @@ static void *dlGetProcAddress (const GLubyte* name)
|
|||||||
#define glewGetContext() ctx
|
#define glewGetContext() ctx
|
||||||
#define wglewGetContext() ctx
|
#define wglewGetContext() ctx
|
||||||
#define glxewGetContext() ctx
|
#define glxewGetContext() ctx
|
||||||
#define GLEW_CONTEXT_ARG_DEF GLEWContext* ctx
|
#ifdef _WIN32
|
||||||
#define WGLEW_CONTEXT_ARG_DEF WGLEWContext* ctx
|
#define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx
|
||||||
#define GLXEW_CONTEXT_ARG_DEF GLXEWContext* ctx
|
#define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx
|
||||||
#define GLEW_CONTEXT_ARG_VAR ctx
|
#define GLXEW_CONTEXT_ARG_DEF_INIT GLXEWContext* ctx
|
||||||
|
#define GLEW_CONTEXT_ARG_VAR_INIT ctx
|
||||||
#else
|
#else
|
||||||
#define GLEW_CONTEXT_ARG_DEF void
|
#define GLEW_CONTEXT_ARG_DEF_INIT void
|
||||||
#define WGLEW_CONTEXT_ARG_DEF void
|
#define WGLEW_CONTEXT_ARG_DEF_INIT void
|
||||||
#define GLXEW_CONTEXT_ARG_DEF void
|
#define GLXEW_CONTEXT_ARG_DEF_INIT void
|
||||||
#define GLEW_CONTEXT_ARG_VAR
|
#define GLEW_CONTEXT_ARG_VAR_INIT
|
||||||
|
#endif
|
||||||
|
#define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx
|
||||||
|
#define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx
|
||||||
|
#define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx
|
||||||
|
#else
|
||||||
|
#define GLEW_CONTEXT_ARG_DEF_INIT void
|
||||||
|
#define WGLEW_CONTEXT_ARG_DEF_INIT void
|
||||||
|
#define GLXEW_CONTEXT_ARG_DEF_INIT void
|
||||||
|
#define GLEW_CONTEXT_ARG_DEF_LIST void
|
||||||
|
#define WGLEW_CONTEXT_ARG_DEF_LIST void
|
||||||
|
#define GLXEW_CONTEXT_ARG_DEF_LIST void
|
||||||
|
#define GLEW_CONTEXT_ARG_VAR_INIT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_WIN32) || !defined(GLEW_MX)
|
#if !defined(_WIN32) || !defined(GLEW_MX)
|
||||||
|
@ -34,7 +34,7 @@ GLboolean wglewGetExtension (const char* name)
|
|||||||
#ifndef GLEW_MX
|
#ifndef GLEW_MX
|
||||||
static
|
static
|
||||||
#endif
|
#endif
|
||||||
GLenum wglewContextInit (WGLEW_CONTEXT_ARG_DEF)
|
GLenum wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST)
|
||||||
{
|
{
|
||||||
GLboolean crippled;
|
GLboolean crippled;
|
||||||
/* find wgl extension string query functions */
|
/* find wgl extension string query functions */
|
||||||
|
Loading…
Reference in New Issue
Block a user