Merge branch 'upstream-experimental' into debian-experimental

5 files changed, 23 insertions, 8 deletions

diff --git a/progs/demos/Makefile.win b/progs/demos/Makefile.win
index 4ac32361b26..0d0b19b9fe7 100644
--- a/progs/demos/Makefile.win
+++ b/progs/demos/Makefile.win
@@ -22,9 +22,11 @@ LIBS   = GLUT32.LIB OPENGL32.LIB
 
 all:	OPENGL32.DLL GLU32.DLL GLUT32.DLL \
 	readtex.h readtex.c showbuffer.h showbuffer.c \
+	extfuncs.h trackball.h trackball.c \
 	arbfplight.exe arbfslight.exe arbocclude.exe bounce.exe \
-	clearspd.exe cubemap.exe drawpix.exe fire.exe fogcoord.exe \
-	fplight.exe gamma.exe gearbox.exe \
+	clearspd.exe cubemap.exe drawpix.exe engine.exe \
+	fire.exe fogcoord.exe \
+	fplight.exe fslight.exe gamma.exe gearbox.exe \
 	gears.exe geartrain.exe gloss.exe \
 	glinfo.exe glslnoise.exe \
 	gltestperf.exe glutfx.exe ipers.exe isosurf.exe lodbias.exe \
@@ -42,14 +44,16 @@ bounce.exe: bounce.obj
 clearspd.exe: clearspd.obj
 cubemap.exe: cubemap.obj readtex.obj
 drawpix.exe: drawpix.obj readtex.obj
+engine.exe: engine.obj readtex.obj trackball.obj
 fire.exe: fire.obj readtex.obj
 fogcoord.exe: fogcoord.obj readtex.obj
 fplight.exe: fplight.obj
+fslight.exe: fslight.obj
 gamma.exe: gamma.obj
 gearbox.exe: gearbox.obj
 gears.exe: gears.obj
 geartrain.exe: geartrain.obj
-gloss.exe: gloss.obj readtex.obj
+gloss.exe: gloss.obj readtex.obj trackball.obj
 glinfo.exe: glinfo.obj
 glslnoise.exe: glslnoise.obj
 gltestperf.exe: gltestperf.obj
@@ -105,14 +109,23 @@ showbuffer.c: $(TOP)\progs\util\showbuffer.c
 showbuffer.h: $(TOP)\progs\util\showbuffer.h
 	copy $** .
 
+trackball.c: $(TOP)\progs\util\trackball.c
+	copy $** .
+
+trackball.h: $(TOP)\progs\util\trackball.h
+	copy $** .
+
+extfuncs.h: $(TOP)\progs\util\extfuncs.h
+	copy $** .
+
 .obj.exe:
 	$(link) $(ldebug) -out:$@ $** /LIBPATH:$(LIBDIR) $(LIBS)
 
 .c.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) /I$(INCDIR) $*.c
+	$(cc) $(cdebug) $(cflags) $(cvars) -D_USE_MATH_DEFINES /I$(INCDIR) $*.c
 
 clean::
-	del *.obj *.exe readtex.* showbuffer.*
+	del *.obj *.exe readtex.* showbuffer.* trackball.*
 
 clobber::
 
diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c
index 374de568872..69575f06236 100644
--- a/progs/demos/arbfslight.c
+++ b/progs/demos/arbfslight.c
@@ -62,7 +62,7 @@ static PFNGLUNIFORM3FVARBPROC glUniform4fvARB = NULL;
 
 static void normalize (GLfloat *dst, const GLfloat *src)
 {
-   GLfloat len = sqrtf (src[0] * src[0] + src[1] * src[1] + src[2] * src[2]);
+   GLfloat len = sqrt (src[0] * src[0] + src[1] * src[1] + src[2] * src[2]);
    dst[0] = src[0] / len;
    dst[1] = src[1] / len;
    dst[2] = src[2] / len;
diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c
index 493ce0e90f1..e6d83bf8fb3 100644
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -58,7 +58,7 @@ static GLfloat xRot = 90.0f, yRot = 0.0f;
 static void
 normalize(GLfloat *dst, const GLfloat *src)
 {
-   GLfloat len = sqrtf(src[0] * src[0] + src[1] * src[1] + src[2] * src[2]);
+   GLfloat len = sqrt(src[0] * src[0] + src[1] * src[1] + src[2] * src[2]);
    dst[0] = src[0] / len;
    dst[1] = src[1] / len;
    dst[2] = src[2] / len;
diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c
index 26403eee0a2..f71cea12744 100644
--- a/progs/demos/tessdemo.c
+++ b/progs/demos/tessdemo.c
@@ -4,10 +4,10 @@
  * Updated for GLU 1.3 tessellation by Gareth Hughes <[email protected]>
  */
 
-#include <GL/glut.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <GL/glut.h>
 
 #define MAX_POINTS	256
 #define MAX_CONTOURS	32
diff --git a/progs/util/extfuncs.h b/progs/util/extfuncs.h
index 90302bb5107..5d647cdae7f 100644
--- a/progs/util/extfuncs.h
+++ b/progs/util/extfuncs.h
@@ -11,6 +11,7 @@ static PFNGLCREATEPROGRAMPROC glCreateProgram_func = NULL;
 static PFNGLCREATESHADERPROC glCreateShader_func = NULL;
 static PFNGLDELETEPROGRAMPROC glDeleteProgram_func = NULL;
 static PFNGLDELETESHADERPROC glDeleteShader_func = NULL;
+static PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib_func = NULL;
 static PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders_func = NULL;
 static PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation_func = NULL;
 static PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog_func = NULL;
@@ -78,6 +79,7 @@ GetExtensionFuncs(void)
    glCreateShader_func = (PFNGLCREATESHADERPROC) glutGetProcAddress("glCreateShader");
    glDeleteProgram_func = (PFNGLDELETEPROGRAMPROC) glutGetProcAddress("glDeleteProgram");
    glDeleteShader_func = (PFNGLDELETESHADERPROC) glutGetProcAddress("glDeleteShader");
+   glGetActiveAttrib_func = (PFNGLGETACTIVEATTRIBPROC) glutGetProcAddress("glGetActiveAttrib");
    glGetAttachedShaders_func = (PFNGLGETATTACHEDSHADERSPROC) glutGetProcAddress("glGetAttachedShaders");
    glGetAttribLocation_func = (PFNGLGETATTRIBLOCATIONPROC) glutGetProcAddress("glGetAttribLocation");
    glGetProgramInfoLog_func = (PFNGLGETPROGRAMINFOLOGPROC) glutGetProcAddress("glGetProgramInfoLog");