mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
Merge pull request #1024 from Subv/blend_gl
GPU/Maxwell3D: Implemented an alternative set of blend factors.
This commit is contained in:
commit
f2c7b5dcd6
2 changed files with 40 additions and 0 deletions
|
@ -357,6 +357,27 @@ public:
|
||||||
OneMinusConstantColor = 0x62,
|
OneMinusConstantColor = 0x62,
|
||||||
ConstantAlpha = 0x63,
|
ConstantAlpha = 0x63,
|
||||||
OneMinusConstantAlpha = 0x64,
|
OneMinusConstantAlpha = 0x64,
|
||||||
|
|
||||||
|
// These values are used by Nouveau and some games.
|
||||||
|
ZeroGL = 0x4000,
|
||||||
|
OneGL = 0x4001,
|
||||||
|
SourceColorGL = 0x4300,
|
||||||
|
OneMinusSourceColorGL = 0x4301,
|
||||||
|
SourceAlphaGL = 0x4302,
|
||||||
|
OneMinusSourceAlphaGL = 0x4303,
|
||||||
|
DestAlphaGL = 0x4304,
|
||||||
|
OneMinusDestAlphaGL = 0x4305,
|
||||||
|
DestColorGL = 0x4306,
|
||||||
|
OneMinusDestColorGL = 0x4307,
|
||||||
|
SourceAlphaSaturateGL = 0x4308,
|
||||||
|
ConstantColorGL = 0xc001,
|
||||||
|
OneMinusConstantColorGL = 0xc002,
|
||||||
|
ConstantAlphaGL = 0xc003,
|
||||||
|
OneMinusConstantAlphaGL = 0xc004,
|
||||||
|
Source1ColorGL = 0xc900,
|
||||||
|
OneMinusSource1ColorGL = 0xc901,
|
||||||
|
Source1AlphaGL = 0xc902,
|
||||||
|
OneMinusSource1AlphaGL = 0xc903,
|
||||||
};
|
};
|
||||||
|
|
||||||
u32 separate_alpha;
|
u32 separate_alpha;
|
||||||
|
|
|
@ -156,42 +156,61 @@ inline GLenum BlendEquation(Maxwell::Blend::Equation equation) {
|
||||||
inline GLenum BlendFunc(Maxwell::Blend::Factor factor) {
|
inline GLenum BlendFunc(Maxwell::Blend::Factor factor) {
|
||||||
switch (factor) {
|
switch (factor) {
|
||||||
case Maxwell::Blend::Factor::Zero:
|
case Maxwell::Blend::Factor::Zero:
|
||||||
|
case Maxwell::Blend::Factor::ZeroGL:
|
||||||
return GL_ZERO;
|
return GL_ZERO;
|
||||||
case Maxwell::Blend::Factor::One:
|
case Maxwell::Blend::Factor::One:
|
||||||
|
case Maxwell::Blend::Factor::OneGL:
|
||||||
return GL_ONE;
|
return GL_ONE;
|
||||||
case Maxwell::Blend::Factor::SourceColor:
|
case Maxwell::Blend::Factor::SourceColor:
|
||||||
|
case Maxwell::Blend::Factor::SourceColorGL:
|
||||||
return GL_SRC_COLOR;
|
return GL_SRC_COLOR;
|
||||||
case Maxwell::Blend::Factor::OneMinusSourceColor:
|
case Maxwell::Blend::Factor::OneMinusSourceColor:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusSourceColorGL:
|
||||||
return GL_ONE_MINUS_SRC_COLOR;
|
return GL_ONE_MINUS_SRC_COLOR;
|
||||||
case Maxwell::Blend::Factor::SourceAlpha:
|
case Maxwell::Blend::Factor::SourceAlpha:
|
||||||
|
case Maxwell::Blend::Factor::SourceAlphaGL:
|
||||||
return GL_SRC_ALPHA;
|
return GL_SRC_ALPHA;
|
||||||
case Maxwell::Blend::Factor::OneMinusSourceAlpha:
|
case Maxwell::Blend::Factor::OneMinusSourceAlpha:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusSourceAlphaGL:
|
||||||
return GL_ONE_MINUS_SRC_ALPHA;
|
return GL_ONE_MINUS_SRC_ALPHA;
|
||||||
case Maxwell::Blend::Factor::DestAlpha:
|
case Maxwell::Blend::Factor::DestAlpha:
|
||||||
|
case Maxwell::Blend::Factor::DestAlphaGL:
|
||||||
return GL_DST_ALPHA;
|
return GL_DST_ALPHA;
|
||||||
case Maxwell::Blend::Factor::OneMinusDestAlpha:
|
case Maxwell::Blend::Factor::OneMinusDestAlpha:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusDestAlphaGL:
|
||||||
return GL_ONE_MINUS_DST_ALPHA;
|
return GL_ONE_MINUS_DST_ALPHA;
|
||||||
case Maxwell::Blend::Factor::DestColor:
|
case Maxwell::Blend::Factor::DestColor:
|
||||||
|
case Maxwell::Blend::Factor::DestColorGL:
|
||||||
return GL_DST_COLOR;
|
return GL_DST_COLOR;
|
||||||
case Maxwell::Blend::Factor::OneMinusDestColor:
|
case Maxwell::Blend::Factor::OneMinusDestColor:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusDestColorGL:
|
||||||
return GL_ONE_MINUS_DST_COLOR;
|
return GL_ONE_MINUS_DST_COLOR;
|
||||||
case Maxwell::Blend::Factor::SourceAlphaSaturate:
|
case Maxwell::Blend::Factor::SourceAlphaSaturate:
|
||||||
|
case Maxwell::Blend::Factor::SourceAlphaSaturateGL:
|
||||||
return GL_SRC_ALPHA_SATURATE;
|
return GL_SRC_ALPHA_SATURATE;
|
||||||
case Maxwell::Blend::Factor::Source1Color:
|
case Maxwell::Blend::Factor::Source1Color:
|
||||||
|
case Maxwell::Blend::Factor::Source1ColorGL:
|
||||||
return GL_SRC1_COLOR;
|
return GL_SRC1_COLOR;
|
||||||
case Maxwell::Blend::Factor::OneMinusSource1Color:
|
case Maxwell::Blend::Factor::OneMinusSource1Color:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusSource1ColorGL:
|
||||||
return GL_ONE_MINUS_SRC1_COLOR;
|
return GL_ONE_MINUS_SRC1_COLOR;
|
||||||
case Maxwell::Blend::Factor::Source1Alpha:
|
case Maxwell::Blend::Factor::Source1Alpha:
|
||||||
|
case Maxwell::Blend::Factor::Source1AlphaGL:
|
||||||
return GL_SRC1_ALPHA;
|
return GL_SRC1_ALPHA;
|
||||||
case Maxwell::Blend::Factor::OneMinusSource1Alpha:
|
case Maxwell::Blend::Factor::OneMinusSource1Alpha:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusSource1AlphaGL:
|
||||||
return GL_ONE_MINUS_SRC1_ALPHA;
|
return GL_ONE_MINUS_SRC1_ALPHA;
|
||||||
case Maxwell::Blend::Factor::ConstantColor:
|
case Maxwell::Blend::Factor::ConstantColor:
|
||||||
|
case Maxwell::Blend::Factor::ConstantColorGL:
|
||||||
return GL_CONSTANT_COLOR;
|
return GL_CONSTANT_COLOR;
|
||||||
case Maxwell::Blend::Factor::OneMinusConstantColor:
|
case Maxwell::Blend::Factor::OneMinusConstantColor:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusConstantColorGL:
|
||||||
return GL_ONE_MINUS_CONSTANT_COLOR;
|
return GL_ONE_MINUS_CONSTANT_COLOR;
|
||||||
case Maxwell::Blend::Factor::ConstantAlpha:
|
case Maxwell::Blend::Factor::ConstantAlpha:
|
||||||
|
case Maxwell::Blend::Factor::ConstantAlphaGL:
|
||||||
return GL_CONSTANT_ALPHA;
|
return GL_CONSTANT_ALPHA;
|
||||||
case Maxwell::Blend::Factor::OneMinusConstantAlpha:
|
case Maxwell::Blend::Factor::OneMinusConstantAlpha:
|
||||||
|
case Maxwell::Blend::Factor::OneMinusConstantAlphaGL:
|
||||||
return GL_ONE_MINUS_CONSTANT_ALPHA;
|
return GL_ONE_MINUS_CONSTANT_ALPHA;
|
||||||
}
|
}
|
||||||
LOG_CRITICAL(Render_OpenGL, "Unimplemented blend factor={}", static_cast<u32>(factor));
|
LOG_CRITICAL(Render_OpenGL, "Unimplemented blend factor={}", static_cast<u32>(factor));
|
||||||
|
|
Loading…
Reference in a new issue