3 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c
index c36746caf..6246c092b 100644
--- a/mesalib/src/mesa/swrast/s_readpix.c
+++ b/mesalib/src/mesa/swrast/s_readpix.c
@@ -327,7 +327,7 @@ fast_read_depth_stencil_pixels(struct gl_context *ctx,
       _mesa_unpack_uint_24_8_depth_stencil_row(rb->Format, width,
 					       map, (GLuint *)dst);
       map += stride;
-      dst += dstStride;
+      dst = (char*)dst + dstStride;
    }
 
    ctx->Driver.UnmapRenderbuffer(ctx, rb);
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 23f2d8f03..f59d2ad3a 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -198,6 +198,7 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp" />
     <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 5b33ebf19..0dde5970e 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -686,6 +686,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">