diff options
| author | donkopunchstania <donkopunchstania@gmail.com> | 2009-10-10 21:19:39 +0000 |
|---|---|---|
| committer | donkopunchstania <donkopunchstania@gmail.com> | 2009-10-10 21:19:39 +0000 |
| commit | 56214e91037279fb16cca0af75c1dec2d8432426 (patch) | |
| tree | 353ae7939c065e55d08e425553482d64668f112f /Source/Core/VideoCommon/Src/VertexLoader.cpp | |
| parent | 5049fcf9f547676aba022d3be8e1b2145b24e9b4 (diff) | |
Moving pixel engine and command processor from core to video common. This will break previous save states. Adds decoding single pixels to texture decoder.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4391 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/VertexLoader.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index 45b0e8eb70..70879ee586 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -25,6 +25,7 @@ #include "StringUtil.h" #include "x64Emitter.h" #include "ABI.h" +#include "PixelEngine.h" #include "LookUpTables.h" #include "Statistics.h" @@ -89,7 +90,7 @@ void LOADERDECL PosMtx_Write() void LOADERDECL UpdateBoundingBox() { - if (!*g_VideoInitialize.pBBoxActive) + if (!PixelEngine::bbox_active) return; // Truly evil hack, reading backwards from the write pointer. If we were writing to write-only @@ -125,10 +126,10 @@ void LOADERDECL UpdateBoundingBox() o[0] = (o[0] + 1.0f) * 320.0f; o[1] = (o[1] + 1.0f) * 240.0f; - if (o[0] < g_VideoInitialize.pBBox[0]) g_VideoInitialize.pBBox[0] = (u16)std::max(0.0f, o[0]); - if (o[0] > g_VideoInitialize.pBBox[1]) g_VideoInitialize.pBBox[1] = (u16)std::min(640.0f, o[0]); - if (o[1] < g_VideoInitialize.pBBox[2]) g_VideoInitialize.pBBox[2] = (u16)std::max(0.0f, o[1]); - if (o[1] > g_VideoInitialize.pBBox[3]) g_VideoInitialize.pBBox[3] = (u16)std::min(480.0f, o[1]); + if (o[0] < PixelEngine::bbox[0]) PixelEngine::bbox[0] = (u16)std::max(0.0f, o[0]); + if (o[0] > PixelEngine::bbox[1]) PixelEngine::bbox[1] = (u16)std::min(640.0f, o[0]); + if (o[1] < PixelEngine::bbox[2]) PixelEngine::bbox[2] = (u16)std::max(0.0f, o[1]); + if (o[1] > PixelEngine::bbox[3]) PixelEngine::bbox[3] = (u16)std::min(480.0f, o[1]); /* if (GetAsyncKeyState(VK_LSHIFT)) { ERROR_LOG(VIDEO, "XForm: %f %f %f to %f %f", p[0], p[1], p[2], o[0], o[1]); |