summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 5362024)
raw | patch | inline | side by side (from parent 1: 5362024)
author | mittorn <mittorn@sibmail.com> | |
Sun, 18 Sep 2016 13:35:56 +0000 (13:35 +0000) | ||
committer | mittorn <mittorn@sibmail.com> | |
Sun, 18 Sep 2016 13:35:56 +0000 (13:35 +0000) |
nanoWrap.cpp | patch | blob | history | |
nanogl.cpp | patch | blob | history |
diff --git a/nanoWrap.cpp b/nanoWrap.cpp
index cdb9313f3469cf920bb09db177a782b42543931e..8ded7b86f1619add94d252b5bf12c40064dab835 100644 (file)
--- a/nanoWrap.cpp
+++ b/nanoWrap.cpp
glEsImpl->glTexEnvi(target, pname, param);
}
glEsImpl->glTexEnvi(target, pname, param);
}
+#ifdef __MULTITEXTURE_SUPPORT__
void glMultiTexCoord3fARB(GLenum a, GLfloat b, GLfloat c, GLfloat)
{
return glMultiTexCoord2fARB(a, b, c);
void glMultiTexCoord3fARB(GLenum a, GLfloat b, GLfloat c, GLfloat)
{
return glMultiTexCoord2fARB(a, b, c);
{
}
{
}
+#endif
void glDrawArrays( GLenum mode, GLint first, GLsizei count )
{
// ensure that all primitives specified between glBegin/glEnd pairs
void glDrawArrays( GLenum mode, GLint first, GLsizei count )
{
// ensure that all primitives specified between glBegin/glEnd pairs
diff --git a/nanogl.cpp b/nanogl.cpp
index c8454b079163a82e5796de264ea3f41f5bdd6314..53b6384848c5c47f115266f46baaf3fcb299e9f8 100644 (file)
--- a/nanogl.cpp
+++ b/nanogl.cpp
#endif
}
#endif
}
+#ifdef XASH_SDL
+#include "SDL.h"
+#endif
+
void *nanoGL_GetProcAddress(const char *name)
{
void *addr = NULL;
void *nanoGL_GetProcAddress(const char *name)
{
void *addr = NULL;