X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=retrace%2Fglretrace_ws.cpp;h=de9fe08c2c7ed4c471019502eb9dd19a5355ff91;hb=542dd3aeee89e112c8b7e73850f548cb07a4a972;hp=aeaadb77be0af415295df5ca39bfa1ef563d2c41;hpb=5ed4ca62e0b1236ff45e608d6b531a2181c6afbb;p=apitrace diff --git a/retrace/glretrace_ws.cpp b/retrace/glretrace_ws.cpp index aeaadb7..de9fe08 100644 --- a/retrace/glretrace_ws.cpp +++ b/retrace/glretrace_ws.cpp @@ -52,6 +52,10 @@ getVisual(glws::Profile profile) { glws::Visual * & visual = visuals[profile]; if (!visual) { visual = glws::createVisual(retrace::doubleBuffer, profile); + if (!visual) { + std::cerr << "error: failed to create OpenGL visual\n"; + exit(1); + } } return visual; } @@ -68,29 +72,42 @@ getDefaultProfile(void) } -glws::Drawable * -createDrawable(glws::Profile profile) { - glws::Drawable *draw = glws::createDrawable(getVisual(profile)); +static glws::Drawable * +createDrawableHelper(glws::Profile profile, int width = 32, int height = 32, bool pbuffer = false) { + glws::Visual *visual = getVisual(profile); + glws::Drawable *draw = glws::createDrawable(visual, width, height, pbuffer); if (!draw) { std::cerr << "error: failed to create OpenGL drawable\n"; exit(1); - return NULL; } return draw; } +glws::Drawable * +createDrawable(glws::Profile profile) { + return createDrawableHelper(profile); +} + + glws::Drawable * createDrawable(void) { - return glretrace::createDrawable(getDefaultProfile()); + return createDrawable(getDefaultProfile()); +} + + +glws::Drawable * +createPbuffer(int width, int height) { + return createDrawableHelper(getDefaultProfile(), width, height, true); } Context * createContext(Context *shareContext, glws::Profile profile) { + glws::Visual *visual = getVisual(profile); glws::Context *shareWsContext = shareContext ? shareContext->wsContext : NULL; - glws::Context *ctx = glws::createContext(getVisual(profile), shareWsContext, profile, retrace::debug); + glws::Context *ctx = glws::createContext(visual, shareWsContext, profile, retrace::debug); if (!ctx) { std::cerr << "error: failed to create OpenGL context\n"; exit(1); @@ -170,6 +187,10 @@ updateDrawable(int width, int height) { glws::Drawable *currentDrawable = currentContext->drawable; assert(currentDrawable); + if (currentDrawable->pbuffer) { + return; + } + if (currentDrawable->visible && width <= currentDrawable->width && height <= currentDrawable->height) {