Merge master and fix conflicts

2 files changed, 8 insertions, 7 deletions

diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript
index aabab95f3a..86eb9ef55e 100644
--- a/src/gallium/winsys/gdi/SConscript
+++ b/src/gallium/winsys/gdi/SConscript
@@ -15,6 +15,7 @@ if env['platform'] == 'windows':
 		'gdi32',
 		'user32',
 		'kernel32',
+		'ws2_32',
 	])
 
 	sources = [
diff --git a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
index d5d9431865..33826524d7 100644
--- a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
+++ b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
@@ -263,7 +263,7 @@ gdi_softpipe_screen_create(void)
 static struct pipe_context *
 gdi_softpipe_context_create(struct pipe_screen *screen)
 {
-   return softpipe_create(screen, screen->winsys, NULL);
+   return softpipe_create(screen);
 }
 
 
@@ -312,21 +312,21 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 {
    switch (fdwReason) {
    case DLL_PROCESS_ATTACH:
-      if (!st_init(&stw_winsys)) {
+      if (!stw_init(&stw_winsys)) {
          return FALSE;
       }
-      return st_init_thread();
+      return stw_init_thread();
 
    case DLL_THREAD_ATTACH:
-      return st_init_thread();
+      return stw_init_thread();
 
    case DLL_THREAD_DETACH:
-      st_cleanup_thread();
+      stw_cleanup_thread();
       break;
 
    case DLL_PROCESS_DETACH:
-      st_cleanup_thread();
-      st_cleanup();
+      stw_cleanup_thread();
+      stw_cleanup();
       break;
    }
    return TRUE;