From 17b2825d760fb6a7b643e5f9c067d249a582cfdb Mon Sep 17 00:00:00 2001
From: Jose Fonseca
Date: Tue, 3 Mar 2015 14:52:15 +0000
Subject: [PATCH] windows/gdi: Remove.
This classic driver is so far behind Gallium softpipe/llvmpipe based
one, that's hard to imagine ever being useful.
v2: Drop drivers/windows from src/mesa/Makefile.am:EXTRA_DIST per Emil
Velikov.
Reviewed-by: Emil Velikov
v3: Update release notes.
---
docs/README.WIN32 | 4 +-
docs/install.html | 5 +-
docs/relnotes/10.6.0.html | 4 +-
include/GL/wmesa.h | 140 -----
src/mesa/Makefile.am | 1 -
src/mesa/drivers/SConscript | 3 -
src/mesa/drivers/windows/gdi/SConscript | 40 --
src/mesa/drivers/windows/gdi/colors.h | 29 -
src/mesa/drivers/windows/gdi/mesa.def | 385 ------------
src/mesa/drivers/windows/gdi/wgl.c | 689 ---------------------
src/mesa/drivers/windows/gdi/wmesa.c | 791 ------------------------
src/mesa/drivers/windows/gdi/wmesadef.h | 43 --
12 files changed, 7 insertions(+), 2127 deletions(-)
delete mode 100644 include/GL/wmesa.h
delete mode 100644 src/mesa/drivers/windows/gdi/SConscript
delete mode 100644 src/mesa/drivers/windows/gdi/colors.h
delete mode 100644 src/mesa/drivers/windows/gdi/mesa.def
delete mode 100644 src/mesa/drivers/windows/gdi/wgl.c
delete mode 100644 src/mesa/drivers/windows/gdi/wmesa.c
delete mode 100644 src/mesa/drivers/windows/gdi/wmesadef.h
diff --git a/docs/README.WIN32 b/docs/README.WIN32
index c8759f65b21..e0e5b9b2ddf 100644
--- a/docs/README.WIN32
+++ b/docs/README.WIN32
@@ -11,9 +11,9 @@ no longer shipped or supported.
Run
- scons osmesa mesagdi
+ scons osmesa
-to build classic mesa Windows GDI drivers; or
+to build classic osmesa driver; or
scons libgl-gdi
diff --git a/docs/install.html b/docs/install.html
index b12e1cb8cd9..9dbfce58b51 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -127,14 +127,13 @@ by -debug for debug builds.
To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do
- scons platform=windows toolchain=crossmingw machine=x86 mesagdi libgl-gdi
+ scons platform=windows toolchain=crossmingw machine=x86 libgl-gdi
This will create:
-- build/windows-x86-debug/mesa/drivers/windows/gdi/opengl32.dll — Mesa + swrast, binary compatible with Windows's opengl32.dll
-
- build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll — Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll
+
- build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll — Mesa + Gallium + softpipe (or llvmpipe), binary compatible with Windows's opengl32.dll
Put them all in the same directory to test them.
diff --git a/docs/relnotes/10.6.0.html b/docs/relnotes/10.6.0.html
index ceeca07ff38..bf29ebbad0f 100644
--- a/docs/relnotes/10.6.0.html
+++ b/docs/relnotes/10.6.0.html
@@ -58,7 +58,9 @@ TBD.
Changes
-TBD.
+
+- Removed classic Windows software rasterizer.
+