summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2010-12-27 22:17:19 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2010-12-27 22:17:19 +0000
commit33506f5bdc91c0f7f6122365589defb60201d899 (patch)
tree0a93f867e0f51ab6a137f265cd86952e404aca38 /Source
parentb21c361a1a687c3f275f64133d263007287a4ff3 (diff)
All 64-bit capable Macs have the SSSE3 extension.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6671 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/VideoCommon/Src/BPFunctions.cpp7
-rw-r--r--Source/Core/VideoCommon/Src/TextureCacheBase.cpp2
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
index 0c9db6f04f..ab30645ac3 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp
@@ -136,6 +136,8 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
void OnPixelFormatChange(const BPCmd &bp)
{
+ int convtype = -1;
+
/*
* When changing the EFB format, the pixel data won't get converted to the new format but stays the same.
* Since we are always using an RGBA8 buffer though, this causes issues in some games.
@@ -145,14 +147,13 @@ void OnPixelFormatChange(const BPCmd &bp)
!g_ActiveConfig.backend_info.bSupportsFormatReinterpretation)
return;
- int new_format = bpmem.zcontrol.pixel_format;
- int old_format = Renderer::GetPrevPixelFormat();
+ unsigned int new_format = bpmem.zcontrol.pixel_format;
+ unsigned int old_format = Renderer::GetPrevPixelFormat();
// no need to reinterpret pixel data in these cases
if (new_format == old_format || old_format == (unsigned int)-1)
goto skip;
- int convtype = -1;
switch (old_format)
{
case PIXELFMT_RGB8_Z24:
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
index 551d87eb11..fffde7b7b2 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
@@ -677,4 +677,4 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer,
entry->FromRenderTarget(bFromZBuffer, bScaleByHalf, cbufid, colmat, source_rect, bIsIntensityFmt, copyfmt);
g_renderer->RestoreAPIState();
-} \ No newline at end of file
+}