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)

diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index 62f75d9541ff429a68554e57267ca87bb695d178..700e3334295872b5fe18eb9e0aabd80018d4b5e7 100644 (file)
--- 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 76c825a0904da13c83f3866166df86c076ac2ece..ceeafd5f909e028654cf8db8f5bc989bbf072bb9 100644 (file)
--- 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 a3dd5ef5b62acad59ed5289dc5589b3627f9d7b6..220923f905143b82078304a627b795e3954a7ec7 100644 (file)
--- 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"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"\r
                                >\r
@@ -417,6 +421,10 @@
                                RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\common\meta.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\..\include\GL\wmesa.h"\r
                                >\r

diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 05bf7d2ea0f0e1676447c1917e4522955bd69f07..4719e342cf1befb4a13a2c3dadd33f63696d5978 100644 (file)
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -450,6 +450,10 @@
                                RelativePath="..\..\..\..\src\mesa\main\fog.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\main\formats.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\framebuffer.c"\r
                                >\r
@@ -1319,6 +1323,10 @@
                                RelativePath="..\..\..\..\src\mesa\main\fog.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\main\formats.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\framebuffer.h"\r
                                >\r
@@ -1876,11 +1884,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\texformat.h"\r
+                               RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"\r
+                               RelativePath="..\..\..\..\src\mesa\main\texformat.h"\r
                                >\r
                        </File>\r
                        <File\r