From 1b445f96737cf5a1a28e81ff94a2e07b2cac3a96 Mon Sep 17 00:00:00 2001
From: Eric Anholt
Date: Mon, 20 Jul 2009 17:58:12 -0700
Subject: i965: Don't clip everything if FRONT_AND_BACK culling while culling
disabled.
Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
Bug #18844, 22077.
(cherry picked from commit 81d555068408d4343d7627c8bedda5675f09bd21)
---
src/mesa/drivers/dri/i965/brw_clip.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
index 5cffcebde4..8fc9f89cb7 100644
--- a/src/mesa/drivers/dri/i965/brw_clip.c
+++ b/src/mesa/drivers/dri/i965/brw_clip.c
@@ -152,7 +152,8 @@ static void upload_clip_prog(struct brw_context *brw)
/* _NEW_POLYGON */
if (key.primitive == GL_TRIANGLES) {
- if (ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
+ if (ctx->Polygon.CullFlag &&
+ ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
key.clip_mode = BRW_CLIPMODE_REJECT_ALL;
else {
GLuint fill_front = CLIP_CULL;
--
cgit v1.2.3
From a6b314150c141f4c73e408b114181e57237540d9 Mon Sep 17 00:00:00 2001
From: Eric Anholt
Date: Thu, 2 Jul 2009 19:21:22 -0700
Subject: intel: Fall back on glBitmap with fog enabled.
We would have to build the program with the appropriate fog mode, and
also supply the fog coordinate if appropriate.
Bug #19413.
(cherry picked from commit 8ae02a3919bf31bd33f86208472e100eedb58497)
---
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index a2ccae1b7d..d137aef13d 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -409,6 +409,12 @@ intel_texture_bitmap(GLcontext * ctx,
return GL_FALSE;
}
+ if (ctx->Fog.Enabled) {
+ if (INTEL_DEBUG & DEBUG_FALLBACKS)
+ fprintf(stderr, "glBitmap() fallback: fog\n");
+ return GL_FALSE;
+ }
+
/* Check that we can load in a texture this big. */
if (width > (1 << (ctx->Const.MaxTextureLevels - 1)) ||
height > (1 << (ctx->Const.MaxTextureLevels - 1))) {
--
cgit v1.2.3
From b9e2e32daf5505896a662dc8df60104c0f51b4b9 Mon Sep 17 00:00:00 2001
From: Brian Paul
Date: Wed, 22 Jul 2009 12:34:07 -0600
Subject: mesa: include GLEW sources in MesaDemos tarball
---
Makefile | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Makefile b/Makefile
index 91515d6fdb..3c83160687 100644
--- a/Makefile
+++ b/Makefile
@@ -388,7 +388,14 @@ GLW_FILES = \
$(DIRECTORY)/src/glw/glw.pc.in \
$(DIRECTORY)/src/glw/depend
+GLEW_FILES = \
+ $(DIRECTORY)/src/glew/*.c \
+ $(DIRECTORY)/src/glew/Makefile \
+ $(DIRECTORY)/src/glew/SConscript \
+ $(DIRECTORY)/src/glew/LICENSE.txt
+
DEMO_FILES = \
+ $(GLEW_FILES) \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \
--
cgit v1.2.3
From 9c4b877519f73f46eac35885d3b8801753168e14 Mon Sep 17 00:00:00 2001
From: Brian Paul
Date: Wed, 22 Jul 2009 12:46:53 -0600
Subject: mesa: bump version to 7.5.1
---
Makefile | 2 +-
configs/default | 2 +-
src/mesa/main/version.h | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 3c83160687..9ac45bd93f 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.5
+VERSION=7.5.1
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index b5ef80afb3..2981bb9a8f 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=7
MESA_MINOR=5
-MESA_TINY=0
+MESA_TINY=1
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index ba027465d4..50c1143ccc 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 7.5
+ * Version: 7.5.1
*
- * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2009 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -30,8 +30,8 @@
/* Mesa version */
#define MESA_MAJOR 7
#define MESA_MINOR 5
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5"
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "7.5.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
--
cgit v1.2.3
From b4ba6a66b70b89e9c049f6ce9b65c1edda118651 Mon Sep 17 00:00:00 2001
From: Brian Paul
Date: Wed, 22 Jul 2009 12:49:34 -0600
Subject: docs: initial release notes for 7.5.1
---
docs/relnotes-7.5.1.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
docs/relnotes.html | 1 +
2 files changed, 55 insertions(+)
create mode 100644 docs/relnotes-7.5.1.html
diff --git a/docs/relnotes-7.5.1.html b/docs/relnotes-7.5.1.html
new file mode 100644
index 0000000000..0f475ad2b4
--- /dev/null
+++ b/docs/relnotes-7.5.1.html
@@ -0,0 +1,54 @@
+
+
+Mesa Release Notes
+
+
+
+
+
+
+
+
Mesa 7.5.1 Release Notes / (date TBD)
+
+
+Mesa 7.5.1 is a bug-fix release fixing issues found since the 7.5 release.
+
+
+The main new feature of Mesa 7.5.x is the
+Gallium3D infrastructure.
+
+
+Mesa 7.5.1 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+
Added missing GLEW library to MesaDemos tarballs.
+
+
+
+
Changes
+
+
+
+
+
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 4764eb689d..7b91a3dc5e 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.