diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 (patch) | |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a /windows/VC7/mesa | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc (diff) | |
| parent | 784cca9fa527de771754d76545970f78094b9adf (diff) | |
Merge branch 'master' into glsl-pp-rework-2
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
Diffstat (limited to 'windows/VC7/mesa')
| -rw-r--r-- | windows/VC7/mesa/mesa/mesa.vcproj | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj index 4d5d4c744b..3a93544b03 100644 --- a/windows/VC7/mesa/mesa/mesa.vcproj +++ b/windows/VC7/mesa/mesa/mesa.vcproj @@ -365,6 +365,9 @@ RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\remap.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c">
</File>
<File
@@ -416,9 +419,6 @@ RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c">
</File>
<File
@@ -446,9 +446,6 @@ RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">
</File>
<File
@@ -593,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
@@ -951,6 +951,9 @@ RelativePath="..\..\..\..\src\mesa\main\rastpos.h">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\remap.h">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">
</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">
|