From ee5e84eba6e94ddd504cb9e0aaaae7363160e74b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 29 Jan 2010 08:37:15 -0700
Subject: windows: assorted build fixes

These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2
but weren't applied.

(cherry picked from commit 82c76cd16f35f4d903f49761af7eb28a755ad299)
---
 src/mesa/drivers/windows/gdi/mesa.def |  4 ++--
 src/mesa/drivers/windows/gdi/wmesa.c  | 12 ------------
 windows/VC8/mesa/gdi/gdi.vcproj       |  8 ++++++++
 windows/VC8/mesa/mesa/mesa.vcproj     | 12 ++++++++++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index 62f75d9541..700e333429 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -870,7 +870,6 @@ EXPORTS
 	_mesa_bzero
 	_mesa_calloc
 	_mesa_choose_tex_format
-	_mesa_compressed_texture_size
 	_mesa_create_framebuffer
 	_mesa_create_visual
 	_mesa_delete_array_object
@@ -932,6 +931,8 @@ EXPORTS
 	_mesa_update_framebuffer_visual
 	_mesa_use_program
 	_mesa_Viewport
+	_mesa_meta_init
+	_mesa_meta_free
 	_mesa_meta_CopyColorSubTable
 	_mesa_meta_CopyColorTable
 	_mesa_meta_CopyConvolutionFilter1D
@@ -941,7 +942,6 @@ EXPORTS
 	_mesa_meta_CopyTexSubImage1D
 	_mesa_meta_CopyTexSubImage2D
 	_mesa_meta_CopyTexSubImage3D
-	_mesa_wait_query
 	_swrast_Accum
 	_swrast_Bitmap
 	_swrast_BlitFramebuffer
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 76c825a090..ceeafd5f90 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1286,9 +1286,6 @@ void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 	    rb->PutMonoValues = write_mono_rgba_pixels_16;
 	    rb->GetRow = read_rgba_span_16;
 	    rb->GetValues = read_rgba_pixels_16;
-            rb->RedBits = 5;
-            rb->GreenBits = 6;
-            rb->BlueBits = 5;
 	    break;
 	case PF_8R8G8B:
 		if (cColorBits == 24)
@@ -1300,9 +1297,6 @@ void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 		    rb->PutMonoValues = write_mono_rgba_pixels_24;
 		    rb->GetRow = read_rgba_span_24;
 		    rb->GetValues = read_rgba_pixels_24;
-	        rb->RedBits = 8;
-	        rb->GreenBits = 8;
-	        rb->BlueBits = 8;		
 		}
 		else
 		{
@@ -1313,9 +1307,6 @@ void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 	        rb->PutMonoValues = write_mono_rgba_pixels_32;
 	        rb->GetRow = read_rgba_span_32;
 	        rb->GetValues = read_rgba_pixels_32;
-            rb->RedBits = 8;
-            rb->GreenBits = 8;
-            rb->BlueBits = 8;
 		}
 	    break;
 	default:
@@ -1331,9 +1322,6 @@ void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,
 	rb->PutMonoValues = write_mono_rgba_pixels_front;
 	rb->GetRow = read_rgba_span_front;
 	rb->GetValues = read_rgba_pixels_front;
-        rb->RedBits = 8; /* XXX fix these (565?) */
-        rb->GreenBits = 8;
-        rb->BlueBits = 8;
     }
 }
 
diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
index a3dd5ef5b6..220923f905 100644
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/windows/VC8/mesa/gdi/gdi.vcproj
@@ -396,6 +396,10 @@
 				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"
 				>
@@ -417,6 +421,10 @@
 				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\include\GL\wmesa.h"
 				>
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 05bf7d2ea0..4719e342cf 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -450,6 +450,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\fog.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\formats.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\framebuffer.c"
 				>
@@ -1319,6 +1323,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\fog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\formats.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\framebuffer.h"
 				>
@@ -1876,11 +1884,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\texformat.h"
+				RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"
+				RelativePath="..\..\..\..\src\mesa\main\texformat.h"
 				>
 			</File>
 			<File
-- 
cgit v1.2.3