summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2016-05-20 12:11:56 -0600
committerBrian Paul <[email protected]>2016-06-30 12:43:49 -0600
commit25cccb5bec7145e054d1246be0dc386cebdcc58a (patch)
tree6c9504d1907628172f1f11e279c846e0b283615d
parent24004a24359af16fcb8671e6b0478f3adee509a7 (diff)
st/wgl: rename curctx to old_ctx in stw_make_current()
Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/gallium/state_trackers/wgl/stw_context.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c
index 5978ca63677..9971f95a6fa 100644
--- a/src/gallium/state_trackers/wgl/stw_context.c
+++ b/src/gallium/state_trackers/wgl/stw_context.c
@@ -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;