From 2b7b2b90e3fb52306c10f62e2a56f5199028d862 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 21 Dec 2009 17:25:03 -0800 Subject: [PATCH 1/9] scons: Define _USE_MATH_DEFINES on MSVC. --- scons/gallium.py | 1 + scons/generic.py | 1 + 2 files changed, 2 insertions(+) diff --git a/scons/gallium.py b/scons/gallium.py index bf6172b4d77..9adba0a0a1d 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -263,6 +263,7 @@ def generate(env): if msvc and env['toolchain'] != 'winddk': cppdefines += [ 'VC_EXTRALEAN', + '_USE_MATH_DEFINES', '_CRT_SECURE_NO_DEPRECATE', ] if debug: diff --git a/scons/generic.py b/scons/generic.py index a9c2244a74f..2a085ddece4 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -335,6 +335,7 @@ def generate(env): if msvc: cppdefines += [ 'VC_EXTRALEAN', + '_USE_MATH_DEFINES', '_CRT_SECURE_NO_DEPRECATE', ] if debug: From de7021b71c1920eeb181d430f2ae2463f964d7cf Mon Sep 17 00:00:00 2001 From: Michal Krol Date: Mon, 7 Sep 2009 09:31:17 +0200 Subject: [PATCH 2/9] mesa: Include only when one is available. (cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f) --- src/mesa/shader/lex.yy.c | 4 ++++ src/mesa/shader/program_lexer.l | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c index fefef573ee5..408ede6eaa7 100644 --- a/src/mesa/shader/lex.yy.c +++ b/src/mesa/shader/lex.yy.c @@ -913,6 +913,10 @@ static yyconst flex_int16_t yy_chk[1023] = #define require_rect (yyextra->option.TexRect) #define require_texarray (yyextra->option.TexArray) +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #define return_token_or_IDENTIFIER(condition, token) \ do { \ if (condition) { \ diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l index c2803ff7074..ce4cb42243b 100644 --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@ -35,6 +35,10 @@ #define require_rect (yyextra->option.TexRect) #define require_texarray (yyextra->option.TexArray) +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #define return_token_or_IDENTIFIER(condition, token) \ do { \ if (condition) { \ From 09415ca234d18d4daf257afc0ced52687fdf43a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 24 Sep 2009 12:36:11 +0100 Subject: [PATCH 3/9] mesa: Fix missing finite symbol error on Windows. Caused by some weird logic regarding the __WIN32__ define which made the finite definition dependent on the header include order. (cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99) --- src/mesa/main/compiler.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index a296404df75..4eb249b4af1 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -107,8 +107,7 @@ extern "C" { /** * finite macro. */ -#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP) -# define __WIN32__ +#if defined(_MSC_VER) # define finite _finite #elif defined(__WATCOMC__) # define finite _finite From 982acbddab536ab16b340243d2034abfb30dfe59 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 10 Oct 2009 10:45:16 -0600 Subject: [PATCH 4/9] progs/perf: Fix MSVC build. (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170) --- progs/tests/texcomp_image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/progs/tests/texcomp_image.h b/progs/tests/texcomp_image.h index e63a56774f3..a3884d4d0df 100644 --- a/progs/tests/texcomp_image.h +++ b/progs/tests/texcomp_image.h @@ -1,4 +1,4 @@ -static int ImgSize = 131072; +#define ImgSize 131072 static unsigned char ImgData[131072] = { 0x4d, 0xbc, 0x0b, 0xb4, 0xda, 0x0a, 0x78, 0xa8, 0x8d, 0xbc, 0x0c, 0xac, 0x8b, 0x7f, 0xeb, 0xf7, 0x8d, 0xbc, 0xeb, 0xab, 0xba, 0xb7, 0x82, 0xa2, 0x8d, 0xbc, 0x2b, 0xb4, 0xa2, 0xfd, 0xee, 0x2f, From 75ad099d3cecc64fe04477ca84bf58b7720edf28 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 21 Dec 2009 18:25:30 -0800 Subject: [PATCH 5/9] mesa: set version string to 7.6.1 --- src/mesa/main/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index e2a98cad3b6..84f0dbc96d6 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -32,7 +32,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 6 #define MESA_PATCH 1 -#define MESA_VERSION_STRING "7.6.1-rc4" +#define MESA_VERSION_STRING "7.6.1" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) From 164b5838521bc7ab4af83bb6de8c8711ff40901c Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 21 Dec 2009 18:27:50 -0800 Subject: [PATCH 6/9] intel: Bump driver date to reflect status as final Q4 driver RC --- src/mesa/drivers/dri/intel/intel_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 2aeca6b81b0..26ff11ba61f 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -68,7 +68,7 @@ int INTEL_DEBUG = (0); #endif -#define DRIVER_DATE "20090712 2009Q2 RC3" +#define DRIVER_DATE "20091221 2009Q4" #define DRIVER_DATE_GEM "GEM " DRIVER_DATE From 7e210b93376ab6fef63995c48d7b1766c4335ad8 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 21 Dec 2009 18:28:32 -0800 Subject: [PATCH 7/9] mesa: set version string to 7.7 --- src/mesa/main/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 4f92353533e..9c758ce3b90 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -32,7 +32,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 7 #define MESA_PATCH 0 -#define MESA_VERSION_STRING "7.7-rc3" +#define MESA_VERSION_STRING "7.7" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) From 6ffed19993ab622e0d63776420bd8c6fc6c646f3 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 21 Dec 2009 18:30:35 -0800 Subject: [PATCH 8/9] Add MD5 checksums for 7.7 release --- docs/relnotes-7.7.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/relnotes-7.7.html b/docs/relnotes-7.7.html index 8c8f763b6f2..de980238e5c 100644 --- a/docs/relnotes-7.7.html +++ b/docs/relnotes-7.7.html @@ -28,7 +28,15 @@ for DRI hardware acceleration.

MD5 checksums

-tbd
+395c9516edf1ad54b0934d8db15557bf  MesaLib-7.7.tar.gz
+e3fa64a1508bc23dd9de9dd2cea7cfb1  MesaLib-7.7.tar.bz2
+e54903eb5e49c3969821fa16b32da245  MesaLib-7.7.zip
+53b5b6f78e55de170d43c98cb6aaab7e  MesaDemos-7.7.tar.gz
+6fd616b27b9826d0faa23e08e05d9435  MesaDemos-7.7.tar.bz2
+240fe06159ad73d5e22c27033b66c80a  MesaDemos-7.7.zip
+9fe11a904b2a9d8cd06cc52bc330b716  MesaGLUT-7.7.tar.gz
+e8dceed05a59a2d3c2619d7d734587e3  MesaGLUT-7.7.tar.bz2
+96af041d435349ee23ead4667ec36363  MesaGLUT-7.7.zip
From 82184970d3aee822d945af7d4902359f28f7057f Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 21 Dec 2009 18:32:32 -0800 Subject: [PATCH 9/9] Add MD5 checksums for 7.6.1 release --- docs/relnotes-7.6.1.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html index a41bcee81c2..19d54041b28 100644 --- a/docs/relnotes-7.6.1.html +++ b/docs/relnotes-7.6.1.html @@ -26,7 +26,15 @@ for DRI hardware acceleration.

MD5 checksums

-tbd
+e80fabad2e3eb7990adae773d6aeacba  MesaLib-7.6.1.tar.gz
+7db4617e9e10ad3aca1b64339fd71b7d  MesaLib-7.6.1.tar.bz2
+dd3275dbf9833480d2e92d0c69b22abd  MesaLib-7.6.1.zip
+f7fdcfe3c0f363e571c60f02f74368fb  MesaDemos-7.6.1.tar.gz
+a4226f06732a02556fcf6be290b86dff  MesaDemos-7.6.1.tar.bz2
+849425f356bd940726cebedfa79de176  MesaDemos-7.6.1.zip
+d40cc7c5e337a85b674e27a8e494f52f  MesaGLUT-7.6.1.tar.gz
+ca9aecb91f05b1da9fd7d5eeb19d47d7  MesaGLUT-7.6.1.tar.bz2
+23fad8398004c977a1d8953079b72ca6  MesaGLUT-7.6.1.zip