Mesa (gallium-0.2): stw: more swapbuffers refactoring
Keith Whitwell
keithw at kemper.freedesktop.org
Mon Feb 2 12:21:35 UTC 2009
Module: Mesa
Branch: gallium-0.2
Commit: cfb3fdfcb1aeb22c62a850795a7351ec9594e74d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfb3fdfcb1aeb22c62a850795a7351ec9594e74d
Author: Keith Whitwell <keith at tungstengraphics.com>
Date: Wed Jan 28 16:23:52 2009 +0000
stw: more swapbuffers refactoring
---
src/gallium/state_trackers/wgl/SConscript | 1 -
src/gallium/state_trackers/wgl/icd/stw_icd.c | 2 +-
src/gallium/state_trackers/wgl/wgl/stw_wgl.c | 20 ++++++++
.../state_trackers/wgl/wgl/stw_wgl_swapbuffers.c | 49 --------------------
4 files changed, 21 insertions(+), 51 deletions(-)
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 1accc26..18ccc5a 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -32,7 +32,6 @@ if env['platform'] in ['windows']:
'wgl/stw_wgl.c',
'wgl/stw_wgl_getprocaddress.c',
'wgl/stw_wgl_pixelformat.c',
- 'wgl/stw_wgl_swapbuffers.c',
]
wgl = env.ConvenienceLibrary(
diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c
index 8cc0932..51967bf 100644
--- a/src/gallium/state_trackers/wgl/icd/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@ -663,7 +663,7 @@ DrvSwapBuffers(
{
debug_printf( "%s( 0x%p )\n", __FUNCTION__, hdc );
- return wglSwapBuffers( hdc );
+ return stw_swap_buffers( hdc );
}
BOOL APIENTRY
diff --git a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
index 8f7ec8d..1a33c7f 100644
--- a/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
+++ b/src/gallium/state_trackers/wgl/wgl/stw_wgl.c
@@ -96,6 +96,26 @@ wglMakeCurrent(
}
+WINGDIAPI BOOL APIENTRY
+wglSwapBuffers(
+ HDC hdc )
+{
+ return stw_swap_buffers( hdc );
+}
+
+
+WINGDIAPI BOOL APIENTRY
+wglSwapLayerBuffers(
+ HDC hdc,
+ UINT fuPlanes )
+{
+ (void) hdc;
+ (void) fuPlanes;
+
+ return FALSE;
+}
+
+
WINGDIAPI BOOL APIENTRY
wglUseFontBitmapsA(
diff --git a/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c b/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c
deleted file mode 100644
index 9984f98..0000000
--- a/src/gallium/state_trackers/wgl/wgl/stw_wgl_swapbuffers.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#include <windows.h>
-
-#include "shared/stw_public.h"
-#include "stw_wgl.h"
-
-WINGDIAPI BOOL APIENTRY
-wglSwapBuffers(
- HDC hdc )
-{
- return stw_swap_buffers( hdc );
-}
-
-WINGDIAPI BOOL APIENTRY
-wglSwapLayerBuffers(
- HDC hdc,
- UINT fuPlanes )
-{
- (void) hdc;
- (void) fuPlanes;
-
- return FALSE;
-}
More information about the mesa-commit
mailing list