AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/wgl: rename curctx to old_ctx in stw_make_current()

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
José Fonseca
2016-05-20 12:11:56 -06:00
committed by Brian Paul
parent 24004a2435
commit 25cccb5bec
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/wgl/stw_context.c
+8 -8
View File
@@ -388,7 +388,7 @@ stw_get_current_dc( void )
BOOL
stw_make_current(HDC hdc, DHGLRC dhglrc)
{
struct stw_context *curctx = NULL;
struct stw_context *old_ctx = NULL;
struct stw_context *ctx = NULL;
struct stw_framebuffer *fb = NULL;
BOOL ret = FALSE;
@@ -396,15 +396,15 @@ stw_make_current(HDC hdc, DHGLRC dhglrc)
if (!stw_dev)
return FALSE;
curctx = stw_current_context();
if (curctx != NULL) {
if (curctx->dhglrc == dhglrc) {
if (curctx->hdc == hdc) {
old_ctx = stw_current_context();
if (old_ctx != NULL) {
if (old_ctx->dhglrc == dhglrc) {
if (old_ctx->hdc == hdc) {
/* Return if already current. */
return TRUE;
}
} else {
curctx->st->flush(curctx->st, ST_FLUSH_FRONT, NULL);
old_ctx->st->flush(old_ctx->st, ST_FLUSH_FRONT, NULL);
}
}
@@ -469,8 +469,8 @@ fail:
/* Unreference the previous framebuffer if any. It must be done after
* make_current, as it can be referenced inside.
*/
if (curctx && curctx != ctx) {
stw_framebuffer_reference(&curctx->current_framebuffer, NULL);
if (old_ctx && old_ctx != ctx) {
stw_framebuffer_reference(&old_ctx->current_framebuffer, NULL);
}
return ret;