mesa: Branch 'master' - 5 commits
Brian Paul
brianp at kemper.freedesktop.org
Thu Apr 26 13:50:28 UTC 2007
docs/relnotes-6.5.3.html | 4 ++--
progs/demos/Makefile.win | 23 ++++++++++++++++++-----
progs/demos/arbfslight.c | 2 +-
progs/demos/fslight.c | 2 +-
progs/demos/tessdemo.c | 2 +-
src/mesa/drivers/windows/gdi/wmesa.c | 1 +
6 files changed, 24 insertions(+), 10 deletions(-)
New commits:
diff-tree 4099531a0af5717087dca993ba780ec98936c4fc (from 1606f2c1230cc01482b5dacb7596835a00299411)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 26 07:50:26 2007 -0600
bump Windows to OpenGL 2.1, set release date
diff --git a/docs/relnotes-6.5.3.html b/docs/relnotes-6.5.3.html
index 61ae904..0e69a84 100644
--- a/docs/relnotes-6.5.3.html
+++ b/docs/relnotes-6.5.3.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 6.5.3 Release Notes / April ??, 2007</H1>
+<H1>Mesa 6.5.3 Release Notes / April 26, 2007</H1>
<p>
Mesa 6.5.3 is a development release with many changes and new features.
@@ -96,7 +96,7 @@ Driver Status
DRI drivers varies with the driver
XMesa/GLX (on Xlib) implements OpenGL 2.1
OSMesa (off-screen) implements OpenGL 2.1
-Windows/Win32 implements OpenGL 1.5
+Windows/Win32 implements OpenGL 2.1
Glide (3dfx Voodoo1/2) implements OpenGL 1.3
SVGA unsupported
Wind River UGL unsupported
diff-tree 1606f2c1230cc01482b5dacb7596835a00299411 (from 1dd7c002143703f2eb76c0f372b6913bf7e06cf7)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 26 07:49:33 2007 -0600
enable 2.1 extensions
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 00d9ee7..c5cd2c6 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1239,6 +1239,7 @@ WMesaContext WMesaCreateContext(HDC hDC,
_mesa_enable_1_4_extensions(ctx);
_mesa_enable_1_5_extensions(ctx);
_mesa_enable_2_0_extensions(ctx);
+ _mesa_enable_2_1_extensions(ctx);
/* Initialize the software rasterizer and helper modules. */
if (!_swrast_CreateContext(ctx) ||
diff-tree 1dd7c002143703f2eb76c0f372b6913bf7e06cf7 (from f42d4ab41ed5d6a160e9902cd9e81ca644e31a35)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 26 07:48:35 2007 -0600
Windows updates
diff --git a/progs/demos/Makefile.win b/progs/demos/Makefile.win
index 4ac3236..0d0b19b 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\showbuff
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-tree f42d4ab41ed5d6a160e9902cd9e81ca644e31a35 (from 4a28548cbfa425edd8b8ad16c93869a9c612a42f)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 26 07:46:59 2007 -0600
move #include <GL/glut.h> after other #includes for Windows
diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c
index 26403ee..f71cea1 100644
--- a/progs/demos/tessdemo.c
+++ b/progs/demos/tessdemo.c
@@ -4,10 +4,10 @@
* Updated for GLU 1.3 tessellation by Gareth Hughes <gareth at valinux.com>
*/
-#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-tree 4a28548cbfa425edd8b8ad16c93869a9c612a42f (from 5814922d25fffb043b75ba8c1fd601e740e25ad7)
Author: Brian <brian at yutani.localnet.net>
Date: Thu Apr 26 07:46:38 2007 -0600
use sqrt(), not sqrtf() for Windows
diff --git a/progs/demos/arbfslight.c b/progs/demos/arbfslight.c
index 374de56..69575f0 100644
--- a/progs/demos/arbfslight.c
+++ b/progs/demos/arbfslight.c
@@ -62,7 +62,7 @@ static PFNGLUNIFORM3FVARBPROC glUniform4
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 493ce0e..e6d83bf 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;
More information about the mesa-commit
mailing list