lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename GL context to ctx to match linux

Browse Source
This commit is contained in:
baldurk
2014-06-28 12:50:19 +01:00
parent 29792558e1
commit f0576ae431
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.h
+1 -1
View File
@@ -39,7 +39,7 @@
struct GLWindowingData
{
HDC DC;
HGLRC RC;
HGLRC ctx;
HWND wnd;
};
renderdoc/driver/gl/gl_replay_win32.cpp
+6 -6
View File
@@ -47,7 +47,7 @@ void GLReplay::MakeCurrentReplayContext(GLWindowingData *ctx)
if(wglMakeCurrentProc && ctx && ctx != prev)
{
prev = ctx;
wglMakeCurrentProc(ctx->DC, ctx->RC);
wglMakeCurrentProc(ctx->DC, ctx->ctx);
}
}
@@ -60,7 +60,7 @@ void GLReplay::CloseReplayContext()
{
if(wglDeleteRC)
{
wglDeleteRC(m_ReplayCtx.RC);
wglDeleteRC(m_ReplayCtx.ctx);
ReleaseDC(m_ReplayCtx.wnd, m_ReplayCtx.DC);
::DestroyWindow(m_ReplayCtx.wnd);
}
@@ -103,7 +103,7 @@ uint64_t GLReplay::MakeOutputWindow(void *wn, bool depth)
attribs[i++] = WGL_CONTEXT_FLAGS_ARB;
attribs[i++] = WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB|WGL_CONTEXT_DEBUG_BIT_ARB;
HGLRC rc = createContextAttribs(DC, m_ReplayCtx.RC, attribs);
HGLRC rc = createContextAttribs(DC, m_ReplayCtx.ctx, attribs);
if(rc == NULL)
{
ReleaseDC(w, DC);
@@ -113,7 +113,7 @@ uint64_t GLReplay::MakeOutputWindow(void *wn, bool depth)
OutputWindow win;
win.DC = DC;
win.RC = rc;
win.ctx = rc;
win.wnd = w;
RECT rect = {0};
@@ -139,7 +139,7 @@ void GLReplay::DestroyOutputWindow(uint64_t id)
OutputWindow &outw = it->second;
wglDeleteRC(outw.RC);
wglDeleteRC(outw.ctx);
ReleaseDC(outw.wnd, outw.DC);
m_OutputWindows.erase(it);
@@ -338,7 +338,7 @@ ReplayCreateStatus GL_CreateReplayDevice(const wchar_t *logfile, IReplayDriver *
replay->SetProxy(logfile == NULL);
GLWindowingData data;
data.DC = dc;
data.RC = rc;
data.ctx = rc;
data.wnd = w;
replay->SetReplayData(data);