diff options
| author | Brian Paul <[email protected]> | 2009-10-28 21:24:11 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-10-28 21:24:11 -0600 |
| commit | 1f196b786d6bd0c6a5dbdc638574ff716cc3d4de (patch) | |
| tree | 5ae2753b99070f8b35c51576bd39e52df63879d6 /windows | |
| parent | 0ea575d721821262a862ceef010db9b1a8b4a6d9 (diff) | |
| parent | 086f9fc0e2aef27f54eda87c733685500555bf20 (diff) | |
Merge branch 'texformat-rework'
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/VC7/mesa/mesa/mesa.vcproj | 8 | ||||
| -rw-r--r-- | windows/VC8/mesa/mesa/mesa.vcproj | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj index 8c8826f5c6a..3a93544b03c 100644 --- a/windows/VC7/mesa/mesa/mesa.vcproj +++ b/windows/VC7/mesa/mesa/mesa.vcproj @@ -590,6 +590,9 @@ RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\texformat.c">
</File>
<File
@@ -1164,10 +1167,13 @@ RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.h">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\texformat.h">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">
+ RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h">
</File>
<File
RelativePath="..\..\..\..\src\mesa\main\teximage.h">
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index 09a3a2711ea..efbfae167fe 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -1031,6 +1031,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\texformat.c"
>
</File>
@@ -1884,11 +1888,15 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\texformat.h"
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"
+ RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"
>
</File>
<File
|