From 5e31f22e50a2dddc0b0a7e5b2fcb515c4e574e60 Mon Sep 17 00:00:00 2001 From: Rodolfo Osvaldo Bogado Date: Fri, 27 Nov 2009 19:42:27 +0000 Subject: small code reorganization. Now efb to ram display correctly but still is misaligned by one pixel please test and give me feedback git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4618 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp | 50 +++------------------- 1 file changed, 5 insertions(+), 45 deletions(-) (limited to 'Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp') diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp index ee663307e5..02cca6592e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp @@ -34,14 +34,6 @@ namespace BPFunctions // Reference: Yet Another Gamecube Documentation // ---------------------------------------------- -static const GLenum glCmpFuncs[8] = { - GL_NEVER, GL_LESS, GL_EQUAL, GL_LEQUAL, GL_GREATER, GL_NOTEQUAL, GL_GEQUAL, GL_ALWAYS -}; - -static const GLenum glLogicOpCodes[16] = { - GL_CLEAR, GL_AND, GL_AND_REVERSE, GL_COPY, GL_AND_INVERTED, GL_NOOP, GL_XOR, - GL_OR, GL_NOR, GL_EQUIV, GL_INVERT, GL_OR_REVERSE, GL_COPY_INVERTED, GL_OR_INVERTED, GL_NAND, GL_SET -}; void FlushPipeline() { @@ -49,17 +41,9 @@ void FlushPipeline() } void SetGenerationMode(const BPCmd &bp) { - // none, ccw, cw, ccw - if (bpmem.genMode.cullmode > 0) - { - glEnable(GL_CULL_FACE); - glFrontFace(bpmem.genMode.cullmode == 2 ? GL_CCW : GL_CW); - } - else - glDisable(GL_CULL_FACE); + Renderer::SetGenerationMode(); } - void SetScissor(const BPCmd &bp) { if (!Renderer::SetScissorRect()) @@ -68,26 +52,11 @@ void SetScissor(const BPCmd &bp) } void SetLineWidth(const BPCmd &bp) { - float fratio = xfregs.rawViewport[0] != 0 ? ((float)Renderer::GetTargetWidth() / EFB_WIDTH) : 1.0f; - if (bpmem.lineptwidth.linesize > 0) - glLineWidth((float)bpmem.lineptwidth.linesize * fratio / 6.0f); // scale by ratio of widths - if (bpmem.lineptwidth.pointsize > 0) - glPointSize((float)bpmem.lineptwidth.pointsize * fratio / 6.0f); + Renderer::SetLineWidth(); } void SetDepthMode(const BPCmd &bp) { - if (bpmem.zmode.testenable) - { - glEnable(GL_DEPTH_TEST); - glDepthMask(bpmem.zmode.updateenable ? GL_TRUE : GL_FALSE); - glDepthFunc(glCmpFuncs[bpmem.zmode.func]); - } - else - { - // if the test is disabled write is disabled too - glDisable(GL_DEPTH_TEST); - glDepthMask(GL_FALSE); - } + Renderer::SetDepthMode(); } void SetBlendMode(const BPCmd &bp) { @@ -95,20 +64,11 @@ void SetBlendMode(const BPCmd &bp) } void SetDitherMode(const BPCmd &bp) { - if (bpmem.blendmode.dither) - glEnable(GL_DITHER); - else - glDisable(GL_DITHER); + Renderer::SetDitherMode(); } void SetLogicOpMode(const BPCmd &bp) { - if (bpmem.blendmode.logicopenable) - { - glEnable(GL_COLOR_LOGIC_OP); - glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]); - } - else - glDisable(GL_COLOR_LOGIC_OP); + Renderer::SetLogicOpMode(); } void SetColorMask(const BPCmd &bp) -- cgit v1.2.3