Should be bufferWidth here, not width. Thanks unknown.

Get rid of Source.cpp, oops.
hrydgard · Nov 5, 2017 · b991dd5 · b991dd5
1 parent 9e65ae1
commit b991dd5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp
@@ -2033,9 +2033,9 @@ void FramebufferManagerCommon::PackFramebufferSync_(VirtualFramebuffer *vfb, int
 }
 
 void FramebufferManagerCommon::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool sync, int x, int y, int w, int h) {
-	// Clamp to width. Sometimes block transfers can cause this to hit.
-	if (x + w >= vfb->width) {
-		w = vfb->width - x;
+	// Clamp to bufferWidth. Sometimes block transfers can cause this to hit.
+	if (x + w >= vfb->bufferWidth) {
+		w = vfb->bufferWidth - x;
 	}
 	if (vfb) {
 		// We'll pseudo-blit framebuffers here to get a resized version of vfb.

diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj
@@ -360,7 +360,6 @@
     <ClCompile Include="Software\SoftGpu.cpp" />
     <ClCompile Include="Software\TransformUnit.cpp" />
     <ClCompile Include="Common\TextureDecoder.cpp" />
-    <ClCompile Include="Source.cpp" />
     <ClCompile Include="Vulkan\DepalettizeShaderVulkan.cpp" />
     <ClCompile Include="Vulkan\DrawEngineVulkan.cpp" />
     <ClCompile Include="Vulkan\FragmentShaderGeneratorVulkan.cpp" />
@@ -386,4 +385,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters
@@ -531,11 +531,8 @@
     <ClCompile Include="Vulkan\StencilBufferVulkan.cpp">
       <Filter>Vulkan</Filter>
     </ClCompile>
-    <ClCompile Include="Source.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="Common\StencilCommon.cpp">
       <Filter>Common</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/GPU/Source.cpp b/GPU/Source.cpp