diff options
author | Neha Bhende <[email protected]> | 2017-03-24 14:53:00 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2017-03-31 13:30:54 -0600 |
commit | 2e24a11f1dcfb6802a643f5891874ea7bb682474 (patch) | |
tree | 971a10879f9b9afb054cc9406055822ca26673ae /src/gallium/state_trackers | |
parent | 7d0aac23927fa68fda1cd30da65eaa297dd2f994 (diff) |
st/wgl: Replace variable name hdc with hDrawDC
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/wgl/stw_context.c | 16 | ||||
-rw-r--r-- | src/gallium/state_trackers/wgl/stw_context.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c index 18273ac3e95..f3145a9e637 100644 --- a/src/gallium/state_trackers/wgl/stw_context.c +++ b/src/gallium/state_trackers/wgl/stw_context.c @@ -186,7 +186,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, DHGLRC hShareContext, if (ctx == NULL) goto no_ctx; - ctx->hdc = hdc; + ctx->hDrawDC = hdc; ctx->hReadDC = hdc; ctx->iPixelFormat = iPixelFormat; ctx->shared = shareCtx != NULL; @@ -387,7 +387,7 @@ stw_get_current_dc( void ) if (!ctx) return NULL; - return ctx->hdc; + return ctx->hDrawDC; } HDC @@ -403,7 +403,7 @@ stw_get_current_read_dc( void ) } BOOL -stw_make_current(HDC hdc, HDC hReadDC, DHGLRC dhglrc) +stw_make_current(HDC hDrawDC, HDC hReadDC, DHGLRC dhglrc) { struct stw_context *old_ctx = NULL; struct stw_context *ctx = NULL; @@ -415,7 +415,7 @@ stw_make_current(HDC hdc, HDC hReadDC, DHGLRC dhglrc) old_ctx = stw_current_context(); if (old_ctx != NULL) { if (old_ctx->dhglrc == dhglrc) { - if (old_ctx->hdc == hdc && old_ctx->hReadDC == hReadDC) { + if (old_ctx->hDrawDC == hDrawDC && old_ctx->hReadDC == hReadDC) { /* Return if already current. */ return TRUE; } @@ -442,7 +442,7 @@ stw_make_current(HDC hdc, HDC hReadDC, DHGLRC dhglrc) } /* This call locks fb's mutex */ - fb = stw_framebuffer_from_hdc( hdc ); + fb = stw_framebuffer_from_hdc( hDrawDC ); if (fb) { stw_framebuffer_update(fb); } @@ -452,9 +452,9 @@ stw_make_current(HDC hdc, HDC hReadDC, DHGLRC dhglrc) * pixel format in some cases, so we must create a framebuffer for * those here. */ - int iPixelFormat = GetPixelFormat(hdc); + int iPixelFormat = GetPixelFormat(hDrawDC); if (iPixelFormat) - fb = stw_framebuffer_create( hdc, iPixelFormat ); + fb = stw_framebuffer_create( hDrawDC, iPixelFormat ); if (!fb) goto fail; } @@ -466,7 +466,7 @@ stw_make_current(HDC hdc, HDC hReadDC, DHGLRC dhglrc) } /* Bind the new framebuffer */ - ctx->hdc = hdc; + ctx->hDrawDC = hDrawDC; ctx->hReadDC = hReadDC; struct stw_framebuffer *old_fb = ctx->current_framebuffer; diff --git a/src/gallium/state_trackers/wgl/stw_context.h b/src/gallium/state_trackers/wgl/stw_context.h index d0e7f2c9f94..b630fc307df 100644 --- a/src/gallium/state_trackers/wgl/stw_context.h +++ b/src/gallium/state_trackers/wgl/stw_context.h @@ -39,7 +39,7 @@ struct stw_context struct st_context_iface *st; DHGLRC dhglrc; int iPixelFormat; - HDC hdc; + HDC hDrawDC; HDC hReadDC; BOOL shared; @@ -62,7 +62,7 @@ HDC stw_get_current_dc( void ); HDC stw_get_current_read_dc( void ); -BOOL stw_make_current( HDC hdc, HDC hReadDC, DHGLRC dhglrc ); +BOOL stw_make_current( HDC hDrawDC, HDC hReadDC, DHGLRC dhglrc ); void stw_notify_current_locked( struct stw_framebuffer *fb ); |