mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-10 22:49:00 +01:00
Wireframe will work in AA mode now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2729 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
5f070bf225
commit
564cf2dac1
@ -1010,6 +1010,8 @@ void Renderer::Swap(const TRectangle& rc)
|
|||||||
v_max = (float)GetTargetHeight();
|
v_max = (float)GetTargetHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
||||||
|
|
||||||
if (/*s_bHaveFramebufferBlit*/ s_MSAASamples > 1)
|
if (/*s_bHaveFramebufferBlit*/ s_MSAASamples > 1)
|
||||||
{
|
{
|
||||||
// Use framebuffer blit to stretch screen.
|
// Use framebuffer blit to stretch screen.
|
||||||
@ -1055,7 +1057,6 @@ void Renderer::Swap(const TRectangle& rc)
|
|||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||||
|
|
||||||
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
|
||||||
glBegin(GL_QUADS);
|
glBegin(GL_QUADS);
|
||||||
glTexCoord2f(0, v_min); glVertex2f(-1, -1);
|
glTexCoord2f(0, v_min); glVertex2f(-1, -1);
|
||||||
glTexCoord2f(0, v_max); glVertex2f(-1, 1);
|
glTexCoord2f(0, v_max); glVertex2f(-1, 1);
|
||||||
@ -1067,15 +1068,15 @@ void Renderer::Swap(const TRectangle& rc)
|
|||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||||
|
|
||||||
// Wireframe
|
|
||||||
if (g_Config.bWireFrame)
|
|
||||||
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
||||||
TextureMngr::DisableStage(0);
|
TextureMngr::DisableStage(0);
|
||||||
// End of non-framebuffer_blit workaround.
|
// End of non-framebuffer_blit workaround.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Wireframe
|
||||||
|
if (g_Config.bWireFrame)
|
||||||
|
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
|
||||||
|
|
||||||
// Take screenshot, if requested
|
// Take screenshot, if requested
|
||||||
if (s_bScreenshot) {
|
if (s_bScreenshot) {
|
||||||
s_criticalScreenshot.Enter();
|
s_criticalScreenshot.Enter();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user