commit ad62987f1ef6e34ed362e7a7ee125ffcd1690241
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:32:06 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:32:06 2012 +0000
tree 8e47c694b91a09634e882c99a414ca9927c5b494
parent 03d390940810e37c00b46178e051a5c0efca6d10

Eliminates usage of Display from Context::makeCurrent.

TRAC #22000

Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1403 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 3e7f6cf..5479076 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -249,10 +249,8 @@
     mResourceManager->release();
 }
 
-void Context::makeCurrent(egl::Display *display, egl::Surface *surface)
+void Context::makeCurrent(egl::Surface *surface)
 {
-    mDisplay = display;
-    mRenderer = mDisplay->getRenderer9();
     mDevice = mRenderer->getDevice(); // D3D9_REMOVE
 
     if (!mHasBeenCurrent)

src/libGLESv2/Context.h

diff --git a/src/libGLESv2/Context.h b/src/libGLESv2/Context.h
index 19cbd44..f47c8a0 100644
--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -282,7 +282,7 @@
 
     ~Context();
 
-    void makeCurrent(egl::Display *display, egl::Surface *surface);
+    void makeCurrent(egl::Surface *surface);
 
     virtual void markAllStateDirty();
     void markDxUniformsDirty();

src/libGLESv2/main.cpp

diff --git a/src/libGLESv2/main.cpp b/src/libGLESv2/main.cpp
index fbccd87..0a69d41 100644
--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -83,7 +83,7 @@
 
     if (context && display && surface)
     {
-        context->makeCurrent(display, surface);
+        context->makeCurrent(surface);
     }
 }