am 95d6192b: Merge "fixing bug of shadowing a variable"

* commit '95d6192bb0d255d8b45b596092bab152760a351f':
  fixing bug of shadowing a variable
This commit is contained in:
David Turner
2011-07-06 07:32:28 -07:00
committed by Android Git Automerger

View File

@@ -464,7 +464,7 @@ EGLNativeContextType createContext(EGLNativeDisplayType display,EglConfig* cfg,E
HDC dpy = NULL;
if(display->needToSetCurrent(cfg->id())){
HWND hwnd = createDummyWindow();
HDC dpy = GetDC(hwnd);
dpy = GetDC(hwnd);
display->setCurrent(cfg->id(),DisplayInfo(dpy,hwnd));
} else {
dpy = display->getCurrentDC();