summaryrefslogtreecommitdiff
path: root/windows/VC7/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-28 21:24:11 -0600
committerBrian Paul <brianp@vmware.com>2009-10-28 21:24:11 -0600
commit1f196b786d6bd0c6a5dbdc638574ff716cc3d4de (patch)
tree5ae2753b99070f8b35c51576bd39e52df63879d6 /windows/VC7/mesa
parent0ea575d721821262a862ceef010db9b1a8b4a6d9 (diff)
parent086f9fc0e2aef27f54eda87c733685500555bf20 (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/VC7/mesa')
-rw-r--r--windows/VC7/mesa/mesa/mesa.vcproj8
1 files changed, 7 insertions, 1 deletions
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 8c8826f5c6..3a93544b03 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">