mirror of https://github.com/RPCS3/rpcs3.git
Merge pull request #986 from Nekotekina/master
RSX "refactoring" reverted
This commit is contained in:
commit
12d1f8202d
File diff suppressed because it is too large
Load Diff
|
@ -171,6 +171,7 @@ private:
|
||||||
void InitVertexData();
|
void InitVertexData();
|
||||||
void InitFragmentData();
|
void InitFragmentData();
|
||||||
|
|
||||||
|
void Enable(bool enable, const u32 cap);
|
||||||
virtual void Close();
|
virtual void Close();
|
||||||
bool LoadProgram();
|
bool LoadProgram();
|
||||||
void WriteBuffers();
|
void WriteBuffers();
|
||||||
|
@ -189,41 +190,7 @@ protected:
|
||||||
virtual void OnInitThread();
|
virtual void OnInitThread();
|
||||||
virtual void OnExitThread();
|
virtual void OnExitThread();
|
||||||
virtual void OnReset();
|
virtual void OnReset();
|
||||||
|
virtual void ExecCMD(u32 cmd);
|
||||||
virtual void ExecCMD();
|
virtual void ExecCMD();
|
||||||
virtual void Enable(u32 cmd, u32 enable);
|
|
||||||
virtual void ClearColor(u32 a, u32 r, u32 g, u32 b);
|
|
||||||
virtual void ClearStencil(u32 stencil);
|
|
||||||
virtual void ClearDepth(u32 depth);
|
|
||||||
virtual void ClearSurface(u32 mask);
|
|
||||||
virtual void ColorMask(bool a, bool r, bool g, bool b);
|
|
||||||
virtual void AlphaFunc(u32 func, float ref);
|
|
||||||
virtual void DepthFunc(u32 func);
|
|
||||||
virtual void DepthMask(u32 flag);
|
|
||||||
virtual void PolygonMode(u32 face, u32 mode);
|
|
||||||
virtual void PointSize(float size);
|
|
||||||
virtual void LogicOp(u32 opcode);
|
|
||||||
virtual void LineWidth(float width);
|
|
||||||
virtual void LineStipple(u16 factor, u16 pattern);
|
|
||||||
virtual void PolygonStipple(u32 pattern);
|
|
||||||
virtual void PrimitiveRestartIndex(u32 index);
|
|
||||||
virtual void CullFace(u32 mode);
|
|
||||||
virtual void FrontFace(u32 mode);
|
|
||||||
virtual void Fogi(u32 mode);
|
|
||||||
virtual void Fogf(float start, float end);
|
|
||||||
virtual void PolygonOffset(float factor, float bias);
|
|
||||||
virtual void DepthRangef(float min, float max);
|
|
||||||
virtual void BlendEquationSeparate(u16 rgb, u16 a);
|
|
||||||
virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha);
|
|
||||||
virtual void BlendColor(u8 r, u8 g, u8 b, u8 a);
|
|
||||||
virtual void LightModeli(u32 enable);
|
|
||||||
virtual void ShadeModel(u32 mode);
|
|
||||||
virtual void DepthBoundsEXT(float min, float max);
|
|
||||||
virtual void Scissor(u16 x, u16 y, u16 width, u16 height);
|
|
||||||
virtual void StencilOp(u32 fail, u32 zfail, u32 zpass);
|
|
||||||
virtual void StencilMask(u32 mask);
|
|
||||||
virtual void StencilFunc(u32 func, u32 ref, u32 mask);
|
|
||||||
virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass);
|
|
||||||
virtual void StencilMaskSeparate(u32 mode, u32 mask);
|
|
||||||
virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask);
|
|
||||||
virtual void Flip();
|
virtual void Flip();
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,50 +6,44 @@ class NullGSRender
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
NullGSRender() {}
|
NullGSRender()
|
||||||
virtual ~NullGSRender() {}
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ~NullGSRender()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual void OnInit() {}
|
virtual void OnInit()
|
||||||
virtual void OnInitThread() {}
|
{
|
||||||
virtual void OnExitThread() {}
|
}
|
||||||
virtual void OnReset() {}
|
|
||||||
virtual void Enable(u32 cmd, u32 enable) {}
|
virtual void OnInitThread()
|
||||||
virtual void ClearColor(u32 a, u32 r, u32 g, u32 b) {}
|
{
|
||||||
virtual void ClearStencil(u32 stencil) {}
|
}
|
||||||
virtual void ClearDepth(u32 depth) {}
|
|
||||||
virtual void ClearSurface(u32 mask) {}
|
virtual void OnExitThread()
|
||||||
virtual void ColorMask(bool a, bool r, bool g, bool b) {}
|
{
|
||||||
virtual void ExecCMD() {}
|
}
|
||||||
virtual void AlphaFunc(u32 func, float ref) {}
|
|
||||||
virtual void DepthFunc(u32 func) {}
|
virtual void OnReset()
|
||||||
virtual void DepthMask(u32 flag) {}
|
{
|
||||||
virtual void PolygonMode(u32 face, u32 mode) {}
|
}
|
||||||
virtual void PointSize(float size) {}
|
|
||||||
virtual void LogicOp(u32 opcode) {}
|
virtual void ExecCMD(u32 cmd)
|
||||||
virtual void LineWidth(float width) {}
|
{
|
||||||
virtual void LineStipple(u16 factor, u16 pattern) {}
|
}
|
||||||
virtual void PolygonStipple(u32 pattern) {}
|
|
||||||
virtual void PrimitiveRestartIndex(u32 index) {}
|
virtual void ExecCMD()
|
||||||
virtual void CullFace(u32 mode) {}
|
{
|
||||||
virtual void FrontFace(u32 mode) {}
|
}
|
||||||
virtual void Fogi(u32 mode) {}
|
|
||||||
virtual void Fogf(float start, float end) {}
|
virtual void Flip()
|
||||||
virtual void PolygonOffset(float factor, float bias) {}
|
{
|
||||||
virtual void DepthRangef(float min, float max) {}
|
}
|
||||||
virtual void BlendEquationSeparate(u16 rgb, u16 a) {}
|
|
||||||
virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha) {}
|
virtual void Close()
|
||||||
virtual void BlendColor(u8 r, u8 g, u8 b, u8 a) {}
|
{
|
||||||
virtual void LightModeli(u32 enable) {}
|
}
|
||||||
virtual void ShadeModel(u32 mode) {}
|
|
||||||
virtual void DepthBoundsEXT(float min, float max) {}
|
|
||||||
virtual void Scissor(u16 x, u16 y, u16 width, u16 height) {}
|
|
||||||
virtual void StencilOp(u32 fail, u32 zfail, u32 zpass) {}
|
|
||||||
virtual void StencilMask(u32 mask) {}
|
|
||||||
virtual void StencilFunc(u32 func, u32 ref, u32 mask) {}
|
|
||||||
virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass) {}
|
|
||||||
virtual void StencilMaskSeparate(u32 mode, u32 mask) {}
|
|
||||||
virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask) {}
|
|
||||||
virtual void Flip() {}
|
|
||||||
virtual void Close() {}
|
|
||||||
};
|
};
|
File diff suppressed because it is too large
Load Diff
|
@ -498,7 +498,7 @@ protected:
|
||||||
m_front_face = 0x0901; // GL_CCW
|
m_front_face = 0x0901; // GL_CCW
|
||||||
m_cull_face = 0x0405; // GL_BACK
|
m_cull_face = 0x0405; // GL_BACK
|
||||||
m_alpha_func = 0x0207; // GL_ALWAYS
|
m_alpha_func = 0x0207; // GL_ALWAYS
|
||||||
m_alpha_ref = 0.0;
|
m_alpha_ref = 0.0f;
|
||||||
m_logic_op = 0x1503; // GL_COPY
|
m_logic_op = 0x1503; // GL_COPY
|
||||||
m_shade_mode = 0x1D01; // GL_SMOOTH
|
m_shade_mode = 0x1D01; // GL_SMOOTH
|
||||||
m_depth_mask = 1;
|
m_depth_mask = 1;
|
||||||
|
@ -635,41 +635,7 @@ protected:
|
||||||
virtual void OnExitThread() = 0;
|
virtual void OnExitThread() = 0;
|
||||||
virtual void OnReset() = 0;
|
virtual void OnReset() = 0;
|
||||||
virtual void ExecCMD() = 0;
|
virtual void ExecCMD() = 0;
|
||||||
virtual void Enable(u32 cmd, u32 enable) = 0;
|
virtual void ExecCMD(u32 cmd) = 0;
|
||||||
virtual void ClearColor(u32 a, u32 r, u32 g, u32 b) = 0;
|
|
||||||
virtual void ClearStencil(u32 stencil) = 0;
|
|
||||||
virtual void ClearDepth(u32 depth) = 0;
|
|
||||||
virtual void ClearSurface(u32 mask) = 0;
|
|
||||||
virtual void ColorMask(bool a, bool r, bool g, bool b) = 0;
|
|
||||||
virtual void AlphaFunc(u32 func, float ref) = 0;
|
|
||||||
virtual void DepthFunc(u32 func) = 0;
|
|
||||||
virtual void DepthMask(u32 flag) = 0;
|
|
||||||
virtual void PolygonMode(u32 face, u32 mode) = 0;
|
|
||||||
virtual void PointSize(float size) = 0;
|
|
||||||
virtual void LogicOp(u32 opcode) = 0;
|
|
||||||
virtual void LineWidth(float width) = 0;
|
|
||||||
virtual void LineStipple(u16 factor, u16 pattern) = 0;
|
|
||||||
virtual void PolygonStipple(u32 pattern) = 0;
|
|
||||||
virtual void PrimitiveRestartIndex(u32 index) = 0;
|
|
||||||
virtual void CullFace(u32 mode) = 0;
|
|
||||||
virtual void FrontFace(u32 mode) = 0;
|
|
||||||
virtual void Fogi(u32 mode) = 0;
|
|
||||||
virtual void Fogf(float start, float end) = 0;
|
|
||||||
virtual void PolygonOffset(float factor, float bias) = 0;
|
|
||||||
virtual void DepthRangef(float min, float max) = 0;
|
|
||||||
virtual void BlendEquationSeparate(u16 rgb, u16 a) = 0;
|
|
||||||
virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha) = 0;
|
|
||||||
virtual void BlendColor(u8 r, u8 g, u8 b, u8 a) = 0;
|
|
||||||
virtual void LightModeli(u32 enable) = 0;
|
|
||||||
virtual void ShadeModel(u32 mode) = 0;
|
|
||||||
virtual void DepthBoundsEXT(float min, float max) = 0;
|
|
||||||
virtual void Scissor(u16 x, u16 y, u16 width, u16 height) = 0;
|
|
||||||
virtual void StencilOp(u32 fail, u32 zfail, u32 zpass) = 0;
|
|
||||||
virtual void StencilMask(u32 mask) = 0;
|
|
||||||
virtual void StencilFunc(u32 func, u32 ref, u32 mask) = 0;
|
|
||||||
virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass) = 0;
|
|
||||||
virtual void StencilMaskSeparate(u32 mode, u32 mask) = 0;
|
|
||||||
virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask) = 0;
|
|
||||||
virtual void Flip() = 0;
|
virtual void Flip() = 0;
|
||||||
|
|
||||||
void LoadVertexData(u32 first, u32 count)
|
void LoadVertexData(u32 first, u32 count)
|
||||||
|
|
Loading…
Reference in New Issue