glretrace: Fix wglCreatePbufferARB without current context.

apitrace · Oct 31, 2015 · 974a1f2 · 974a1f2
1 parent 410e4f9
commit 974a1f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/retrace/glretrace_wgl.cpp b/retrace/glretrace_wgl.cpp
@@ -248,6 +248,9 @@ static void retrace_wglCreatePbufferARB(trace::Call &call) {
 
     pbInfo.texMipmap = !!parseAttrib(attribs, WGL_MIPMAP_TEXTURE_ARB, 0);
 
+    // WGL interface needs the HDC
+    pbInfo.hdc_drawable = getDrawable(call.arg(0).toUInt());
+
     glws::Drawable *drawable = glretrace::createPbuffer(iWidth, iHeight,
                                                         &pbInfo);
 

diff --git a/retrace/glws.hpp b/retrace/glws.hpp
@@ -43,6 +43,8 @@ namespace glws {
 
 using glprofile::Profile;
 
+class Drawable;
+
 
 bool
 checkExtension(const char *extName, const char *extString);
@@ -53,6 +55,8 @@ struct pbuffer_info
     int texFormat;  // GL_RGB, GL_RGBA, or GL_NONE
     int texTarget;  // GL_TEXTURE_1D/2D/CUBE_MAP or GL_NONE
     bool texMipmap; // 0 or 1 (false/true)
+
+    Drawable *hdc_drawable;  // Needed for WGL Pbuffers
 };
 
 

diff --git a/retrace/glws_wgl.cpp b/retrace/glws_wgl.cpp
@@ -504,7 +504,10 @@ glws::WglDrawable::createPbuffer(const Visual *vis,
 
     int pixelFormats[20];
     UINT numPixelFormats;
-    HDC hdc = wglGetCurrentDC();
+    WglDrawable *wgl_draw = static_cast<WglDrawable *>(pbInfo->hdc_drawable);
+    HDC hdc = wgl_draw->hDC;
+    assert(hdc);
+
     if (!pfnWglChoosePixelFormatARB(hdc, attribs, NULL,
                                     20, pixelFormats,
                                     &numPixelFormats)) {