KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Brian Paul 2010-01-29 08:37:15 -07:00
parent 81cca6d453
commit ee5e84eba6
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/windows/gdi/mesa.def
View File

@ -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

12
src/mesa/drivers/windows/gdi/wmesa.c
View File

@ -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;
}
}

8
windows/VC8/mesa/gdi/gdi.vcproj
View File

@ -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"
>

12
windows/VC8/mesa/mesa/mesa.vcproj
View File

@ -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