4 files changed, 22 insertions, 22 deletions
diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c
index 0c1cfade781..9c28442c1f9 100644
--- a/src/gallium/state_trackers/wgl/icd/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@ -62,7 +62,7 @@ DrvCopyContext(
        dst == NULL)
       return FALSE;
 
-   return stw_wgl_copy_context( src, dst, fuMask );
+   return stw_copy_context( src, dst, fuMask );
 }
 
 DHGLRC APIENTRY
@@ -82,7 +82,7 @@ DrvCreateLayerContext(
    return 0;
 
 found_slot:
-   stw_dev->ctx_array[i].hglrc = stw_wgl_create_context( hdc, iLayerPlane );
+   stw_dev->ctx_array[i].hglrc = stw_create_context( hdc, iLayerPlane );
    if (stw_dev->ctx_array[i].hglrc == NULL)
       return 0;
 
@@ -104,7 +104,7 @@ DrvDeleteContext(
    BOOL success = FALSE;
 
    if (hglrc != NULL) {
-      success = stw_wgl_delete_context( hglrc );
+      success = stw_delete_context( hglrc );
       if (success)
          stw_dev->ctx_array[dhglrc - 1].hglrc = NULL;
    }
diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.c b/src/gallium/state_trackers/wgl/shared/stw_context.c
index 75cfcda35df..b2cb6124168 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_context.c
+++ b/src/gallium/state_trackers/wgl/shared/stw_context.c
@@ -47,7 +47,7 @@ static HDC current_hdc = NULL;
 static HGLRC current_hrc = NULL;
 
 BOOL
-stw_wgl_copy_context(
+stw_copy_context(
    HGLRC hglrcSrc,
    HGLRC hglrcDst,
    UINT mask )
@@ -60,7 +60,7 @@ stw_wgl_copy_context(
 }
 
 HGLRC
-stw_wgl_create_context(
+stw_create_context(
    HDC hdc,
    int iLayerPlane )
 {
@@ -136,7 +136,7 @@ stw_wgl_create_context(
 
 
 BOOL
-stw_wgl_delete_context(
+stw_delete_context(
    HGLRC hglrc )
 {
    struct wgl_context **link = &ctx_head;
@@ -193,19 +193,19 @@ get_window_size( HDC hdc, GLuint *width, GLuint *height )
 }
 
 HGLRC
-stw_wgl_get_current_context( void )
+stw_get_current_context( void )
 {
    return current_hrc;
 }
 
 HDC
-stw_wgl_get_current_dc( void )
+stw_get_current_dc( void )
 {
     return current_hdc;
 }
 
 BOOL
-stw_wgl_make_current(
+stw_make_current(
    HDC hdc,
    HGLRC hglrc )
 {
diff --git a/src/gallium/state_trackers/wgl/shared/stw_context.h b/src/gallium/state_trackers/wgl/shared/stw_context.h
index b418e4e02a7..91e71cf087f 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_context.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_context.h
@@ -46,19 +46,19 @@ wgl_context_from_hdc(HDC hdc );
 //////////////////
 
 
-BOOL stw_wgl_copy_context( HGLRC hglrcSrc,
+BOOL stw_copy_context( HGLRC hglrcSrc,
                            HGLRC hglrcDst,
                            UINT mask );
 
-HGLRC stw_wgl_create_context( HDC hdc, int iLayerPlane );
+HGLRC stw_create_context( HDC hdc, int iLayerPlane );
 
-BOOL stw_wgl_delete_context( HGLRC hglrc );
+BOOL stw_delete_context( HGLRC hglrc );
 
-HGLRC stw_wgl_get_current_context( void );
+HGLRC stw_get_current_context( void );
 
-HDC stw_wgl_get_current_dc( void );
+HDC stw_get_current_dc( void );
 
-BOOL stw_wgl_make_current( HDC hdc, HGLRC hglrc );
+BOOL stw_make_current( HDC hdc, HGLRC hglrc );
 
 
 
diff --git a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
index 92fd3406586..f6a4f66dd7d 100644
--- a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
@@ -38,14 +38,14 @@ wglCopyContext(
    HGLRC hglrcDst,
    UINT mask )
 {
-   return stw_wgl_copy_context( hglrcSrc, hglrcDst, mask );
+   return stw_copy_context( hglrcSrc, hglrcDst, mask );
 }
 
 WINGDIAPI HGLRC APIENTRY
 wglCreateContext(
    HDC hdc )
 {
-   return (HGLRC) stw_wgl_create_context( hdc, 0 );
+   return (HGLRC) stw_create_context( hdc, 0 );
 }
 
 WINGDIAPI HGLRC APIENTRY
@@ -53,27 +53,27 @@ wglCreateLayerContext(
    HDC hdc,
    int iLayerPlane )
 {
-   return (HGLRC) stw_wgl_create_context( hdc, iLayerPlane );
+   return (HGLRC) stw_create_context( hdc, iLayerPlane );
 }
 
 WINGDIAPI BOOL APIENTRY
 wglDeleteContext(
    HGLRC hglrc )
 {
-   return stw_wgl_delete_context( hglrc );
+   return stw_delete_context( hglrc );
 }
 
 
 WINGDIAPI HGLRC APIENTRY
 wglGetCurrentContext( VOID )
 {
-   return stw_wgl_get_current_context();
+   return stw_get_current_context();
 }
 
 WINGDIAPI HDC APIENTRY
 wglGetCurrentDC( VOID )
 {
-   return stw_wgl_get_current_dc();
+   return stw_get_current_dc();
 }
 
 WINGDIAPI BOOL APIENTRY
@@ -81,7 +81,7 @@ wglMakeCurrent(
    HDC hdc,
    HGLRC hglrc )
 {
-   return stw_wgl_make_current( hdc, hglrc );
+   return stw_make_current( hdc, hglrc );
 }