diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-22 22:27:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-22 22:27:13 +0200 |
| commit | 4469aefef31cd682683944aa91e0b3edc0042fa4 (patch) | |
| tree | ec4dd6d3694d56afd853c891781a3311cc920c9c /mesalib | |
| parent | 112d89481850102f28b6e7ff4f40b65c41e11f6c (diff) | |
| download | vcxsrv-4469aefef31cd682683944aa91e0b3edc0042fa4.tar.gz vcxsrv-4469aefef31cd682683944aa91e0b3edc0042fa4.tar.bz2 vcxsrv-4469aefef31cd682683944aa91e0b3edc0042fa4.zip | |
Synchronised and compiled
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 4 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 1 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 738bee250..02e76dd35 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -141,6 +141,7 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param, return 0; case __DRI2_RENDERER_VIDEO_MEMORY: { /* XXX: Do we want to return the full amount of system memory ? */ +#ifndef _MSC_VER const long system_memory_pages = sysconf(_SC_PHYS_PAGES); const long system_page_size = sysconf(_SC_PAGE_SIZE); @@ -155,6 +156,9 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param, value[0] = system_memory_megabytes; return 0; +#else + return -1; +#endif } case __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE: /** diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 430a49c11..ca189e6fd 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -326,6 +326,7 @@ <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\textureview.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 0d05001c8..5129166f7 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -806,6 +806,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|