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

Eliminates usage of Display from Context::makeCurrent.
ad62987f · daniel@transgaming.com · 03d39094 · ad62987f · ad62987f · ad62987f
Commit ad62987f authored Nov 28, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Context.cpp src/libGLESv2/Context.cpp +1 -3

Context.h src/libGLESv2/Context.h +1 -1

main.cpp src/libGLESv2/main.cpp +1 -1

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -249,10 +249,8 @@ Context::~Context()
    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)

--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -282,7 +282,7 @@ class Context

    ~Context();

-    void makeCurrent(egl::Display *display, egl::Surface *surface);
+    void makeCurrent(egl::Surface *surface);

    virtual void markAllStateDirty();
    void markDxUniformsDirty();

--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -83,7 +83,7 @@ void makeCurrent(Context *context, egl::Display *display, egl::Surface *surface)

    if (context && display && surface)
    {
-        context->makeCurrent(display, surface);
+        context->makeCurrent(surface);
    }
 }