summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-03-26 00:08:58 +0100
committerPierre Bourdon <delroth@gmail.com>2014-03-26 00:08:58 +0100
commitb4337a21928745bef151c8ab665138f7a435f198 (patch)
treef3792e8f08d1c847059a2354db188a8d62fdd2df /Source/Core/VideoBackends
parent6351f28ab41172d7b07626da737d691ce88c9285 (diff)
parent16105db7092707bc130a345ed1e630e2ef1f7747 (diff)
Merge pull request #204 from neobrain/bitfield_cleanup
Bitfield cleanup
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp19
-rw-r--r--Source/Core/VideoBackends/D3D/PSTextureEncoder.h18
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp12
-rw-r--r--Source/Core/VideoBackends/D3D/TextureCache.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D/TextureCache.h2
-rw-r--r--Source/Core/VideoBackends/D3D/TextureEncoder.h5
-rw-r--r--Source/Core/VideoBackends/OGL/Render.cpp24
-rw-r--r--Source/Core/VideoBackends/OGL/TextureCache.cpp10
-rw-r--r--Source/Core/VideoBackends/OGL/TextureCache.h2
-rw-r--r--Source/Core/VideoBackends/Software/BPMemLoader.cpp16
-rw-r--r--Source/Core/VideoBackends/Software/EfbInterface.cpp368
-rw-r--r--Source/Core/VideoBackends/Software/Tev.cpp18
-rw-r--r--Source/Core/VideoBackends/Software/TextureEncoder.cpp20
13 files changed, 261 insertions, 259 deletions
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
index db7eb9ee3e..d5ef9ef715 100644
--- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
@@ -10,7 +10,6 @@
#include "VideoBackends/D3D/PSTextureEncoder.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/TextureCache.h"
-#include "VideoCommon/BPMemory.h"
// "Static mode" will compile a new EFB encoder shader for every combination of
// encoding configurations. It's compatible with Shader Model 4.
@@ -1031,8 +1030,8 @@ void PSTextureEncoder::Shutdown()
}
size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
- bool scaleByHalf)
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+ bool isIntensity, bool scaleByHalf)
{
if (!m_ready) // Make sure we initialized OK
return 0;
@@ -1122,7 +1121,7 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr);
- ID3D11ShaderResourceView* pEFB = (srcFormat == PIXELFMT_Z24) ?
+ ID3D11ShaderResourceView* pEFB = (srcFormat == PEControl::Z24) ?
FramebufferManager::GetEFBDepthTexture()->GetSRV() :
// FIXME: Instead of resolving EFB, it would be better to pick out a
// single sample from each pixel. The game may break if it isn't
@@ -1208,10 +1207,10 @@ static const char* INTENSITY_FUNC_NAMES[2] = {
"Intensity_0", "Intensity_1"
};
-bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcFormat,
+bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, PEControl::PixelFormat srcFormat,
bool isIntensity, bool scaleByHalf)
{
- size_t fetchNum = srcFormat;
+ size_t fetchNum = static_cast<size_t>(srcFormat);
size_t scaledFetchNum = scaleByHalf ? 1 : 0;
size_t intensityNum = isIntensity ? 1 : 0;
size_t generatorNum = dstFormat;
@@ -1244,7 +1243,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
}
INFO_LOG(VIDEO, "Compiling efb encoding shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d",
- dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
+ dstFormat, static_cast<int>(srcFormat), isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
// Shader permutation not found, so compile it
D3DBlob* bytecode = nullptr;
@@ -1258,7 +1257,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros))
{
WARN_LOG(VIDEO, "EFB encoder shader for dstFormat 0x%X, srcFormat %d, isIntensity %d, scaleByHalf %d failed to compile",
- dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
+ dstFormat, static_cast<int>(srcFormat), isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
// Add dummy shader to map to prevent trying to compile over and
// over again
m_staticShaders[key] = nullptr;
@@ -1369,9 +1368,9 @@ static const char* INTENSITY_CLASS_NAMES[2] = {
};
bool PSTextureEncoder::SetDynamicShader(unsigned int dstFormat,
- unsigned int srcFormat, bool isIntensity, bool scaleByHalf)
+ PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf)
{
- size_t fetchNum = srcFormat;
+ size_t fetchNum = static_cast<size_t>(srcFormat);
size_t scaledFetchNum = scaleByHalf ? 1 : 0;
size_t intensityNum = isIntensity ? 1 : 0;
size_t generatorNum = dstFormat;
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
index e581775b73..c14020acfe 100644
--- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
@@ -32,8 +32,8 @@ public:
void Init();
void Shutdown();
size_t Encode(u8* dst, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
- bool scaleByHalf);
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+ bool isIntensity, bool scaleByHalf);
private:
@@ -54,15 +54,15 @@ private:
// Stuff only used in static-linking mode (SM4.0-compatible)
bool InitStaticMode();
- bool SetStaticShader(unsigned int dstFormat, unsigned int srcFormat,
- bool isIntensity, bool scaleByHalf);
+ bool SetStaticShader(unsigned int dstFormat,
+ PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf);
typedef unsigned int ComboKey; // Key for a shader combination
- ComboKey MakeComboKey(unsigned int dstFormat, unsigned int srcFormat,
- bool isIntensity, bool scaleByHalf)
+ ComboKey MakeComboKey(unsigned int dstFormat,
+ PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf)
{
- return (dstFormat << 4) | (srcFormat << 2) | (isIntensity ? (1<<1) : 0)
+ return (dstFormat << 4) | (static_cast<int>(srcFormat) << 2) | (isIntensity ? (1<<1) : 0)
| (scaleByHalf ? (1<<0) : 0);
}
@@ -74,8 +74,8 @@ private:
// Microsoft fixes their bloody HLSL compiler)
bool InitDynamicMode();
- bool SetDynamicShader(unsigned int dstFormat, unsigned int srcFormat,
- bool isIntensity, bool scaleByHalf);
+ bool SetDynamicShader(unsigned int dstFormat,
+ PEControl::PixelFormat srcFormat, bool isIntensity, bool scaleByHalf);
ID3D11PixelShader* m_dynamicShader;
ID3D11ClassLinkage* m_classLinkage;
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 6ed8ae82bc..f890726e35 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -315,7 +315,7 @@ void Renderer::SetColorMask()
UINT8 color_mask = 0;
if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL)
{
- if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24))
+ if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24))
color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA;
if (bpmem.blendmode.colorupdate)
color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE;
@@ -409,7 +409,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
float val = *(float*)map.pData;
u32 ret = 0;
- if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
+ if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
{
// if Z is in 16 bit format you must return a 16 bit integer
ret = ((u32)(val * 0xffff));
@@ -440,15 +440,15 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
// check what to do with the alpha channel (GX_PokeAlphaRead)
PixelEngine::UPEAlphaReadReg alpha_read_mode = PixelEngine::GetAlphaReadMode();
- if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
+ if (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24)
{
ret = RGBA8ToRGBA6ToRGBA8(ret);
}
- else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
+ else if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
{
ret = RGBA8ToRGB565ToRGBA8(ret);
}
- if (bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24)
+ if (bpmem.zcontrol.pixel_format != PEControl::RGBA6_Z24)
{
ret |= 0xFF000000;
}
@@ -634,7 +634,7 @@ void Renderer::SetBlendMode(bool forceUpdate)
{
// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
- bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
+ bool target_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
const D3D11_BLEND d3dSrcFactors[8] =
{
D3D11_BLEND_ZERO,
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp
index 608cbd67cc..773833ee18 100644
--- a/Source/Core/VideoBackends/D3D/TextureCache.cpp
+++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp
@@ -121,7 +121,7 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
}
void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect,
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
const float *colmat)
{
@@ -159,9 +159,9 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
// Create texture copy
D3D::drawShadedTexQuad(
- (srcFormat == PIXELFMT_Z24) ? FramebufferManager::GetEFBDepthTexture()->GetSRV() : FramebufferManager::GetEFBColorTexture()->GetSRV(),
+ (srcFormat == PEControl::Z24) ? FramebufferManager::GetEFBDepthTexture()->GetSRV() : FramebufferManager::GetEFBColorTexture()->GetSRV(),
&sourcerect, Renderer::GetTargetWidth(), Renderer::GetTargetHeight(),
- (srcFormat == PIXELFMT_Z24) ? PixelShaderCache::GetDepthMatrixProgram(true) : PixelShaderCache::GetColorMatrixProgram(true),
+ (srcFormat == PEControl::Z24) ? PixelShaderCache::GetDepthMatrixProgram(true) : PixelShaderCache::GetColorMatrixProgram(true),
VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), FramebufferManager::GetEFBDepthTexture()->GetDSV());
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.h b/Source/Core/VideoBackends/D3D/TextureCache.h
index 569f2d024f..6045d3f7db 100644
--- a/Source/Core/VideoBackends/D3D/TextureCache.h
+++ b/Source/Core/VideoBackends/D3D/TextureCache.h
@@ -30,7 +30,7 @@ private:
unsigned int expanded_width, unsigned int levels) override;
void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect,
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
const float *colmat) override;
diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h
index 56f4092ea8..13dacccce9 100644
--- a/Source/Core/VideoBackends/D3D/TextureEncoder.h
+++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h
@@ -4,6 +4,7 @@
#pragma once
+#include "VideoCommon/BPMemory.h"
#include "VideoCommon/VideoCommon.h"
namespace DX11
@@ -111,8 +112,8 @@ public:
virtual void Shutdown() = 0;
// Returns size in bytes of encoded block of memory
virtual size_t Encode(u8* dst, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity,
- bool scaleByHalf) = 0;
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
+ bool isIntensity, bool scaleByHalf) = 0;
};
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index a9ea91f7bc..a74ab6966a 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -877,7 +877,7 @@ void Renderer::SetColorMask()
{
if (bpmem.blendmode.colorupdate)
ColorMask = GL_TRUE;
- if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24))
+ if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24))
AlphaMask = GL_TRUE;
}
glColorMask(ColorMask, ColorMask, ColorMask, AlphaMask);
@@ -989,7 +989,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
// Scale the 32-bit value returned by glReadPixels to a 24-bit
// value (GC uses a 24-bit Z-buffer).
// TODO: in RE0 this value is often off by one, which causes lighting to disappear
- if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
+ if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
{
// if Z is in 16 bit format you must return a 16 bit integer
z = z >> 16;
@@ -1047,15 +1047,15 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
// check what to do with the alpha channel (GX_PokeAlphaRead)
PixelEngine::UPEAlphaReadReg alpha_read_mode = PixelEngine::GetAlphaReadMode();
- if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
+ if (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24)
{
color = RGBA8ToRGBA6ToRGBA8(color);
}
- else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
+ else if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16)
{
color = RGBA8ToRGB565ToRGBA8(color);
}
- if (bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24)
+ if (bpmem.zcontrol.pixel_format != PEControl::RGBA6_Z24)
{
color |= 0xFF000000;
}
@@ -1207,7 +1207,7 @@ void Renderer::SetBlendMode(bool forceUpdate)
{
// Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel
// Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1.
- bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
+ bool target_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && target_has_alpha;
bool useDualSource = useDstAlpha && g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
@@ -1279,18 +1279,18 @@ void Renderer::SetBlendMode(bool forceUpdate)
// adjust alpha factors
if (useDualSource)
{
- srcidx = GX_BL_ONE;
- dstidx = GX_BL_ZERO;
+ srcidx = BlendMode::ONE;
+ dstidx = BlendMode::ZERO;
}
else
{
// we can't use GL_DST_COLOR or GL_ONE_MINUS_DST_COLOR for source in alpha channel so use their alpha equivalent instead
- if (srcidx == GX_BL_DSTCLR) srcidx = GX_BL_DSTALPHA;
- if (srcidx == GX_BL_INVDSTCLR) srcidx = GX_BL_INVDSTALPHA;
+ if (srcidx == BlendMode::DSTCLR) srcidx = BlendMode::DSTALPHA;
+ if (srcidx == BlendMode::INVDSTCLR) srcidx = BlendMode::INVDSTALPHA;
// we can't use GL_SRC_COLOR or GL_ONE_MINUS_SRC_COLOR for destination in alpha channel so use their alpha equivalent instead
- if (dstidx == GX_BL_SRCCLR) dstidx = GX_BL_SRCALPHA;
- if (dstidx == GX_BL_INVSRCCLR) dstidx = GX_BL_INVSRCALPHA;
+ if (dstidx == BlendMode::SRCCLR) dstidx = BlendMode::SRCALPHA;
+ if (dstidx == BlendMode::INVSRCCLR) dstidx = BlendMode::INVSRCALPHA;
}
GLenum srcFactorAlpha = glSrcFactors[srcidx];
GLenum dstFactorAlpha = glDestFactors[dstidx];
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp
index 6a20813e80..3757bc45f9 100644
--- a/Source/Core/VideoBackends/OGL/TextureCache.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp
@@ -258,14 +258,14 @@ TextureCache::TCacheEntryBase* TextureCache::CreateRenderTargetTexture(
}
void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect,
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
const float *colmat)
{
g_renderer->ResetAPIState(); // reset any game specific settings
// Make sure to resolve anything we need to read from.
- const GLuint read_texture = (srcFormat == PIXELFMT_Z24) ?
+ const GLuint read_texture = (srcFormat == PEControl::Z24) ?
FramebufferManager::ResolveAndGetDepthTarget(srcRect) :
FramebufferManager::ResolveAndGetRenderTarget(srcRect);
@@ -282,7 +282,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
glViewport(0, 0, virtual_width, virtual_height);
- if (srcFormat == PIXELFMT_Z24)
+ if (srcFormat == PEControl::Z24)
{
s_DepthMatrixProgram.Bind();
if (s_DepthCbufid != cbufid)
@@ -298,7 +298,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
}
TargetRectangle R = g_renderer->ConvertEFBRectangle(srcRect);
- glUniform4f(srcFormat == PIXELFMT_Z24 ? s_DepthCopyPositionUniform : s_ColorCopyPositionUniform,
+ glUniform4f(srcFormat == PEControl::Z24 ? s_DepthCopyPositionUniform : s_ColorCopyPositionUniform,
R.left, R.top, R.right, R.bottom);
GL_REPORT_ERRORD();
@@ -312,7 +312,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
int encoded_size = TextureConverter::EncodeToRamFromTexture(
addr,
read_texture,
- srcFormat == PIXELFMT_Z24,
+ srcFormat == PEControl::Z24,
isIntensity,
dstFormat,
scaleByHalf,
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h
index 19190efd0d..e1e2ec694c 100644
--- a/Source/Core/VideoBackends/OGL/TextureCache.h
+++ b/Source/Core/VideoBackends/OGL/TextureCache.h
@@ -43,7 +43,7 @@ private:
unsigned int expanded_width, unsigned int level) override;
void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
- unsigned int srcFormat, const EFBRectangle& srcRect,
+ PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
const float *colmat) override;
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
index 7672e233ac..b81f2b340e 100644
--- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
@@ -160,11 +160,11 @@ void SWBPWritten(int address, int newvalue)
case BPMEM_TEV_REGISTER_L+6: // Reg 4
{
int regNum = (address >> 1 ) & 0x3;
- ColReg& reg = bpmem.tevregs[regNum].low;
- bool konst = reg.type;
+ TevReg& reg = bpmem.tevregs[regNum];
+ bool konst = reg.type_ra;
- Rasterizer::SetTevReg(regNum, Tev::ALP_C, konst, reg.b); // A
- Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.a); // R
+ Rasterizer::SetTevReg(regNum, Tev::ALP_C, konst, reg.alpha);
+ Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.red);
break;
}
@@ -175,11 +175,11 @@ void SWBPWritten(int address, int newvalue)
case BPMEM_TEV_REGISTER_H+6: // Reg 4
{
int regNum = (address >> 1 ) & 0x3;
- ColReg& reg = bpmem.tevregs[regNum].high;
- bool konst = reg.type;
+ TevReg& reg = bpmem.tevregs[regNum];
+ bool konst = reg.type_bg;
- Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.b); // G
- Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.a); // B
+ Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.green);
+ Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.blue);
break;
}
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp
index dffe392e6f..c1ded19322 100644
--- a/Source/Core/VideoBackends/Software/EfbInterface.cpp
+++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp
@@ -33,14 +33,14 @@ namespace EfbInterface
void SetPixelAlphaOnly(u32 offset, u8 a)
{
- switch (bpmem.zcontrol.pixel_format)
+ switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_Z24:
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB8_Z24:
+ case PEControl::Z24:
+ case PEControl::RGB565_Z16:
// do nothing
break;
- case PIXELFMT_RGBA6_Z24:
+ case PEControl::RGBA6_Z24:
{
u32 a32 = a;
u32 *dst = (u32*)&efb[offset];
@@ -50,7 +50,7 @@ namespace EfbInterface
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
}
@@ -58,8 +58,8 @@ namespace EfbInterface
{
switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_Z24:
+ case PEControl::RGB8_Z24:
+ case PEControl::Z24:
{
u32 src = *(u32*)rgb;
u32 *dst = (u32*)&efb[offset];
@@ -68,7 +68,7 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGBA6_Z24:
+ case PEControl::RGBA6_Z24:
{
u32 src = *(u32*)rgb;
u32 *dst = (u32*)&efb[offset];
@@ -79,9 +79,9 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB565_Z16:
{
- INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+ INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
u32 src = *(u32*)rgb;
u32 *dst = (u32*)&efb[offset];
u32 val = *dst & 0xff000000;
@@ -90,16 +90,16 @@ namespace EfbInterface
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
}
void SetPixelAlphaColor(u32 offset, u8 *color)
{
- switch (bpmem.zcontrol.pixel_format)
+ switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_Z24:
+ case PEControl::RGB8_Z24:
+ case PEControl::Z24:
{
u32 src = *(u32*)color;
u32 *dst = (u32*)&efb[offset];
@@ -108,7 +108,7 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGBA6_Z24:
+ case PEControl::RGBA6_Z24:
{
u32 src = *(u32*)color;
u32 *dst = (u32*)&efb[offset];
@@ -120,9 +120,9 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB565_Z16:
{
- INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+ INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
u32 src = *(u32*)color;
u32 *dst = (u32*)&efb[offset];
u32 val = *dst & 0xff000000;
@@ -131,16 +131,16 @@ namespace EfbInterface
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
}
- void GetPixelColor(u32 offset, u8 *color)
+ void GetPixelColor(u32 offset, u8 *color)
{
switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_Z24:
+ case PEControl::RGB8_Z24:
+ case PEControl::Z24:
{
u32 src = *(u32*)&efb[offset];
u32 *dst = (u32*)color;
@@ -148,7 +148,7 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGBA6_Z24:
+ case PEControl::RGBA6_Z24:
{
u32 src = *(u32*)&efb[offset];
color[ALP_C] = Convert6To8(src & 0x3f);
@@ -157,9 +157,9 @@ namespace EfbInterface
color[RED_C] = Convert6To8((src >> 18) & 0x3f);
}
break;
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB565_Z16:
{
- INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+ INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
u32 src = *(u32*)&efb[offset];
u32 *dst = (u32*)color;
u32 val = 0xff | ((src & 0x00ffffff) << 8);
@@ -167,7 +167,7 @@ namespace EfbInterface
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
}
@@ -175,9 +175,9 @@ namespace EfbInterface
{
switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_RGBA6_Z24:
- case PIXELFMT_Z24:
+ case PEControl::RGB8_Z24:
+ case PEControl::RGBA6_Z24:
+ case PEControl::Z24:
{
u32 *dst = (u32*)&efb[offset];
u32 val = *dst & 0xff000000;
@@ -185,9 +185,9 @@ namespace EfbInterface
*dst = val;
}
break;
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB565_Z16:
{
- INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+ INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
u32 *dst = (u32*)&efb[offset];
u32 val = *dst & 0xff000000;
val |= depth & 0x00ffffff;
@@ -195,111 +195,113 @@ namespace EfbInterface
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
}
- u32 GetPixelDepth(u32 offset)
+ u32 GetPixelDepth(u32 offset)
{
u32 depth = 0;
switch (bpmem.zcontrol.pixel_format)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_RGBA6_Z24:
- case PIXELFMT_Z24:
+ case PEControl::RGB8_Z24:
+ case PEControl::RGBA6_Z24:
+ case PEControl::Z24:
{
depth = (*(u32*)&efb[offset]) & 0x00ffffff;
}
break;
- case PIXELFMT_RGB565_Z16:
+ case PEControl::RGB565_Z16:
{
- INFO_LOG(VIDEO, "PIXELFMT_RGB565_Z16 is not supported correctly yet");
+ INFO_LOG(VIDEO, "RGB565_Z16 is not supported correctly yet");
depth = (*(u32*)&efb[offset]) & 0x00ffffff;
}
break;
default:
- ERROR_LOG(VIDEO, "Unsupported pixel format: %i", bpmem.zcontrol.pixel_format);
+ ERROR_LOG(VIDEO, "Unsupported pixel format: %i", static_cast<int>(bpmem.zcontrol.pixel_format));
}
return depth;
}
- u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, int mode)
+ u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
{
- switch (mode) {
- case 0: // zero
- return 0;
- case 1: // one
- return 0xffffffff;
- case 2: // dstclr
- return *(u32*)dstClr;
- case 3: // invdstclr
- return 0xffffffff - *(u32*)dstClr;
- case 4: // srcalpha
- {
- u8 alpha = srcClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 5: // invsrcalpha
- {
- u8 alpha = 0xff - srcClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 6: // dstalpha
- {
- u8 alpha = dstClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 7: // invdstalpha
- {
- u8 alpha = 0xff - dstClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
+ switch (mode)
+ {
+ case BlendMode::ZERO:
+ return 0;
+ case BlendMode::ONE:
+ return 0xffffffff;
+ case BlendMode::DSTCLR:
+ return *(u32*)dstClr;
+ case BlendMode::INVDSTCLR:
+ return 0xffffffff - *(u32*)dstClr;
+ case BlendMode::SRCALPHA:
+ {
+ u8 alpha = srcClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::INVSRCALPHA:
+ {
+ u8 alpha = 0xff - srcClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::DSTALPHA:
+ {
+ u8 alpha = dstClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::INVDSTALPHA:
+ {
+ u8 alpha = 0xff - dstClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
}
return 0;
}
- u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, int mode)
+ u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
{
- switch (mode) {
- case 0: // zero
- return 0;
- case 1: // one
- return 0xffffffff;
- case 2: // srcclr
- return *(u32*)srcClr;
- case 3: // invsrcclr
- return 0xffffffff - *(u32*)srcClr;
- case 4: // srcalpha
- {
- u8 alpha = srcClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 5: // invsrcalpha
- {
- u8 alpha = 0xff - srcClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 6: // dstalpha
- {
- u8 alpha = dstClr[ALP_C] & 0xff;
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
- case 7: // invdstalpha
- {
- u8 alpha = 0xff - dstClr[ALP_C];
- u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
- return factor;
- }
+ switch (mode)
+ {
+ case BlendMode::ZERO:
+ return 0;
+ case BlendMode::ONE:
+ return 0xffffffff;
+ case BlendMode::SRCCLR:
+ return *(u32*)srcClr;
+ case BlendMode::INVSRCCLR:
+ return 0xffffffff - *(u32*)srcClr;
+ case BlendMode::SRCALPHA:
+ {
+ u8 alpha = srcClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::INVSRCALPHA:
+ {
+ u8 alpha = 0xff - srcClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::DSTALPHA:
+ {
+ u8 alpha = dstClr[ALP_C] & 0xff;
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
+ case BlendMode::INVDSTALPHA:
+ {
+ u8 alpha = 0xff - dstClr[ALP_C];
+ u32 factor = alpha << 24 | alpha << 16 | alpha << 8 | alpha;
+ return factor;
+ }
}
return 0;
@@ -327,58 +329,58 @@ namespace EfbInterface
}
}
- void LogicBlend(u32 srcClr, u32 &dstClr, int op)
+ void LogicBlend(u32 srcClr, u32 &dstClr, BlendMode::LogicOp op)
{
switch (op)
{
- case 0: // clear
- dstClr = 0;
- break;
- case 1: // and
- dstClr = srcClr & dstClr;
- break;
- case 2: // revand
- dstClr = srcClr & (~dstClr);
- break;
- case 3: // copy
- dstClr = srcClr;
- break;
- case 4: // invand
- dstClr = (~srcClr) & dstClr;
- break;
- case 5: // noop
- // Do nothing
- break;
- case 6: // xor
- dstClr = srcClr ^ dstClr;
- break;
- case 7: // or
- dstClr = srcClr | dstClr;
- break;
- case 8: // nor
- dstClr = ~(srcClr | dstClr);
- break;
- case 9: // equiv
- dstClr = ~(srcClr ^ dstClr);
- break;
- case 10: // inv
- dstClr = ~dstClr;
- break;
- case 11: // revor
- dstClr = srcClr | (~dstClr);
- break;
- case 12: // invcopy
- dstClr = ~srcClr;
- break;
- case 13: // invor
- dstClr = (~srcClr) | dstClr;
- break;
- case 14: // nand
- dstClr = ~(srcClr & dstClr);
- break;
- case 15: // set
- dstClr = 0xffffffff;
- break;
+ case BlendMode::CLEAR:
+ dstClr = 0;
+ break;
+ case BlendMode::AND:
+ dstClr = srcClr & dstClr;
+ break;
+ case BlendMode::AND_REVERSE:
+ dstClr = srcClr & (~dstClr);
+ break;
+ case BlendMode::COPY:
+ dstClr = srcClr;
+ break;
+ case BlendMode::AND_INVERTED:
+ dstClr = (~srcClr) & dstClr;
+ break;
+ case BlendMode::NOOP:
+ // Do nothing
+ break;
+ case BlendMode::XOR:
+ dstClr = srcClr ^ dstClr;
+ break;
+ case BlendMode::OR:
+ dstClr = srcClr | dstClr;
+ break;
+ case BlendMode::NOR:
+ dstClr = ~(srcClr | dstClr);
+ break;
+ case BlendMode::EQUIV:
+ dstClr = ~(srcClr ^ dstClr);
+ break;
+ case BlendMode::INVERT:
+ dstClr = ~dstClr;
+ break;
+ case BlendMode::OR_REVERSE:
+ dstClr = srcClr | (~dstClr);
+ break;
+ case BlendMode::COPY_INVERTED:
+ dstClr = ~srcClr;
+ break;
+ case BlendMode::OR_INVERTED:
+ dstClr = (~srcClr) | dstClr;
+ break;
+ case BlendMode::NAND:
+ dstClr = ~(srcClr & dstClr);
+ break;
+ case BlendMode::SET:
+ dstClr = 0xffffffff;
+ break;
}
}
@@ -584,33 +586,33 @@ namespace EfbInterface
switch (bpmem.zmode.func)
{
- case COMPARE_NEVER:
- pass = false;
- break;
- case COMPARE_LESS:
- pass = z < depth;
- break;
- case COMPARE_EQUAL:
- pass = z == depth;
- break;
- case COMPARE_LEQUAL:
- pass = z <= depth;
- break;
- case COMPARE_GREATER:
- pass = z > depth;
- break;
- case COMPARE_NEQUAL:
- pass = z != depth;
- break;
- case COMPARE_GEQUAL:
- pass = z >= depth;
- break;
- case COMPARE_ALWAYS:
- pass = true;
- break;
- default:
- pass = false;
- ERROR_LOG(VIDEO, "Bad Z compare mode %i", bpmem.zmode.func);
+ case ZMode::NEVER:
+ pass = false;
+ break;
+ case ZMode::LESS:
+ pass = z < depth;
+ break;
+ case ZMode::EQUAL:
+ pass = z == depth;
+ break;
+ case ZMode::LEQUAL:
+ pass = z <= depth;
+ break;
+ case ZMode::GREATER:
+ pass = z > depth;
+ break;
+ case ZMode::NEQUAL:
+ pass = z != depth;
+ break;
+ case ZMode::GEQUAL:
+ pass = z >= depth;
+ break;
+ case ZMode::ALWAYS:
+ pass = true;
+ break;
+ default:
+ pass = false;
+ ERROR_LOG(VIDEO, "Bad Z compare mode %i", (int)bpmem.zmode.func);
}
if (pass && bpmem.zmode.updateenable)
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp
index 3b517175eb..1890aaa3e3 100644
--- a/Source/Core/VideoBackends/Software/Tev.cpp
+++ b/Source/Core/VideoBackends/Software/Tev.cpp
@@ -413,17 +413,17 @@ void Tev::DrawAlphaCompare(TevStageCombiner::AlphaCombiner &ac)
}
}
-static bool AlphaCompare(int alpha, int ref, int comp)
+static bool AlphaCompare(int alpha, int ref, AlphaTest::CompareMode comp)
{
switch (comp) {
- case ALPHACMP_ALWAYS: return true;
- case ALPHACMP_NEVER: return false;
- case ALPHACMP_LEQUAL: return alpha <= ref;
- case ALPHACMP_LESS: return alpha < ref;
- case ALPHACMP_GEQUAL: return alpha >= ref;
- case ALPHACMP_GREATER: return alpha > ref;
- case ALPHACMP_EQUAL: return alpha == ref;
- case ALPHACMP_NEQUAL: return alpha != ref;
+ case AlphaTest::ALWAYS: return true;
+ case AlphaTest::NEVER: return false;
+ case AlphaTest::LEQUAL: return alpha <= ref;
+ case AlphaTest::LESS: return alpha < ref;
+ case AlphaTest::GEQUAL: return alpha >= ref;
+ case AlphaTest::GREATER: return alpha > ref;
+ case AlphaTest::EQUAL: return alpha == ref;
+ case AlphaTest::NEQUAL: return alpha != ref;
}
return true;
}
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
index cf99dbf911..5913125a08 100644
--- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
@@ -1386,8 +1386,8 @@ void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
void Encode(u8 *dest_ptr)
{
- int pixelformat = bpmem.zcontrol.pixel_format;
- bool bFromZBuffer = pixelformat == PIXELFMT_Z24;
+ auto pixelformat = bpmem.zcontrol.pixel_format;
+ bool bFromZBuffer = pixelformat == PEControl::Z24;
bool bIsIntensityFmt = bpmem.triggerEFBCopy.intensity_fmt > 0;
u32 copyfmt = ((bpmem.triggerEFBCopy.target_pixel_format / 2) + ((bpmem.triggerEFBCopy.target_pixel_format & 1) * 8));
@@ -1409,24 +1409,24 @@ void Encode(u8 *dest_ptr)
if (bpmem.triggerEFBCopy.half_scale)
{
- if (pixelformat == PIXELFMT_RGBA6_Z24)
+ if (pixelformat == PEControl::RGBA6_Z24)
EncodeRGBA6halfscale(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_RGB8_Z24)
+ else if (pixelformat == PEControl::RGB8_Z24)
EncodeRGB8halfscale(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_RGB565_Z16) // not supported
+ else if (pixelformat == PEControl::RGB565_Z16) // not supported
EncodeRGB8halfscale(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_Z24)
+ else if (pixelformat == PEControl::Z24)
EncodeZ24halfscale(dest_ptr, src, format);
}
else
{
- if (pixelformat == PIXELFMT_RGBA6_Z24)
+ if (pixelformat == PEControl::RGBA6_Z24)
EncodeRGBA6(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_RGB8_Z24)
+ else if (pixelformat == PEControl::RGB8_Z24)
EncodeRGB8(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_RGB565_Z16) // not supported
+ else if (pixelformat == PEControl::RGB565_Z16) // not supported
EncodeRGB8(dest_ptr, src, format);
- else if (pixelformat == PIXELFMT_Z24)
+ else if (pixelformat == PEControl::Z24)
EncodeZ24(dest_ptr, src, format);
}
}