Browse Source

Assorted Windows fixes (Karl Schultz)

tags/mesa_7_1_rc2
Brian Paul 18 years ago
parent
commit
645c131264

+ 1
- 1
include/GL/wmesa.h View File

@@ -130,7 +130,7 @@ extern void WMesaPaletteChange(HPALETTE Pal);

extern void WMesaMove(void);

void WMesaShareLists(WMesaContext ctx_to_share, WMesaContext ctx);

#ifdef __cplusplus
}

+ 7
- 7
src/mesa/drivers/windows/gdi/wgl.c View File

@@ -581,6 +581,13 @@ WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsA(HDC hdc, DWORD first,
return success;
}

WINGDIAPI BOOL GLAPIENTRY wglShareLists(HGLRC hglrc1,
HGLRC hglrc2)
{
WMesaShareLists((WMesaContext)hglrc1, (WMesaContext)hglrc2);
return(TRUE);
}



/* NOT IMPLEMENTED YET */
@@ -600,13 +607,6 @@ WINGDIAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC hdc,
return(NULL);
}

WINGDIAPI BOOL GLAPIENTRY wglShareLists(HGLRC hglrc1,
HGLRC hglrc2)
{
WMesaShareLists(hglrc1, hglrc2);
return(TRUE);
}


WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsW(HDC hdc,
DWORD first,

+ 956
- 422
windows/VC7/mesa/mesa/mesa.vcproj
File diff suppressed because it is too large
View File


+ 4
- 0
windows/VC8/mesa/gdi/gdi.vcproj View File

@@ -244,6 +244,10 @@
RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"
>
</File>
<File
RelativePath="..\..\..\..\include\GL\wmesa.h"
>
</File>
<File
RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h"
>

+ 8
- 8
windows/VC8/mesa/glu/glu.vcproj View File

@@ -47,7 +47,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -142,7 +142,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/glu.pch"
@@ -418,11 +418,11 @@
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
>
</File>
<File
@@ -518,19 +518,19 @@
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
>
</File>
<File
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
>
</File>
<File

Loading…
Cancel
Save