DXGL r78 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:r77‎ | r78 | r79 >
Date:17:42, 15 January 2012
Author:admin
Status:new
Tags:
Comment:
Eliminate deprecated glPushAttrib/glPopAttrib
Modified paths:
  • /ddraw/glDirectDrawSurface.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirectDrawSurface.cpp
@@ -589,7 +589,6 @@
590590 ddInterface->GetSizes(sizes);
591591 int error;
592592 error = SetFBO(texture,0,false);
593 - glPushAttrib(GL_VIEWPORT_BIT);
594593 glViewport(0,0,fakex,fakey);
595594 RECT destrect;
596595 if(!lpDestRect)
@@ -710,7 +709,6 @@
711710 glColor3f(1.0,1.0,1.0);
712711 glDisable(GL_TEXTURE_2D);
713712 SetFBO(0,0,false);
714 - glPopAttrib();
715713 if(((ddsd.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER)) &&
716714 (ddsd.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) ||
717715 ((ddsd.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) &&
@@ -1118,6 +1116,7 @@
11191117 if(ddInterface->GetFullscreen())
11201118 {
11211119 ddInterface->GetSizes(sizes);
 1120+ glViewport(0,0,sizes[4],sizes[5]);
11221121 view[0] = (signed)-(sizes[4]-sizes[0])/2;
11231122 view[1] = (signed)(sizes[4]-sizes[0])/2+sizes[0];
11241123 view[2] = (signed)(sizes[5]-sizes[1])/2+sizes[1];