From: Keith Whitwell Date: Mon, 2 Feb 2009 12:17:01 +0000 (+0000) Subject: Merge branch 'gallium-wgl-rework' into gallium-0.2 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e4d1757f81323636e99abc5fff411d42e19e901a;p=mesa.git Merge branch 'gallium-wgl-rework' into gallium-0.2 Conflicts: src/gallium/state_trackers/wgl/shared/stw_public.h --- e4d1757f81323636e99abc5fff411d42e19e901a diff --cc src/gallium/state_trackers/wgl/shared/stw_device.c index 00000000000,88eeae7de7c..6873e813ee3 mode 000000,100644..100644 --- a/src/gallium/state_trackers/wgl/shared/stw_device.c +++ b/src/gallium/state_trackers/wgl/shared/stw_device.c @@@ -1,0 -1,94 +1,91 @@@ + /************************************************************************** + * + * 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 + + #include "pipe/p_debug.h" -#include "pipe/p_winsys.h" + #include "pipe/p_screen.h" + + #include "shared/stw_device.h" + #include "shared/stw_winsys.h" + #include "shared/stw_pixelformat.h" + #include "shared/stw_public.h" + #include "stw.h" + + + struct stw_device *stw_dev = NULL; + + + /** - * XXX: Dispatch pipe_winsys::flush_front_buffer to our ++ * XXX: Dispatch pipe_screen::flush_front_buffer to our + * stw_winsys::flush_front_buffer. + */ + static void -st_flush_frontbuffer(struct pipe_winsys *ws, ++st_flush_frontbuffer(struct pipe_screen *screen, + struct pipe_surface *surf, + void *context_private ) + { + const struct stw_winsys *stw_winsys = stw_dev->stw_winsys; - struct pipe_winsys *winsys = stw_dev->screen->winsys; + HDC hdc = (HDC)context_private; + - stw_winsys->flush_frontbuffer(winsys, surf, hdc); ++ stw_winsys->flush_frontbuffer(screen, surf, hdc); + } + + + boolean + stw_shared_init(const struct stw_winsys *stw_winsys) + { + static struct stw_device stw_dev_storage; + + assert(!stw_dev); + + stw_dev = &stw_dev_storage; + memset(stw_dev, 0, sizeof(*stw_dev)); + + stw_dev->stw_winsys = stw_winsys; + + stw_dev->screen = stw_winsys->create_screen(); + if(!stw_dev->screen) + goto error1; + - /* XXX: pipe_winsys::flush_frontbuffer should go away */ - stw_dev->screen->winsys->flush_frontbuffer = st_flush_frontbuffer; ++ stw_dev->screen->flush_frontbuffer = st_flush_frontbuffer; + + pixelformat_init(); + + return TRUE; + + error1: + stw_dev = NULL; + return FALSE; + } + + + void + stw_shared_cleanup(void) + { + stw_dev = NULL; + } diff --cc src/gallium/state_trackers/wgl/shared/stw_framebuffer.c index 00000000000,90f181e28b0..c70b31a4881 mode 000000,100644..100644 --- a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c +++ b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c @@@ -1,0 -1,212 +1,212 @@@ + /************************************************************************** + * + * 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 + + #include "main/context.h" + #include "pipe/p_format.h" + #include "pipe/p_screen.h" + #include "state_tracker/st_context.h" + #include "state_tracker/st_public.h" + #include "stw_framebuffer.h" + #include "stw_device.h" + #include "stw_public.h" + #include "stw_winsys.h" + + + void + framebuffer_resize( + struct stw_framebuffer *fb, + GLuint width, + GLuint height ) + { + if (fb->hbmDIB == NULL || fb->stfb->Base.Width != width || fb->stfb->Base.Height != height) { + if (fb->hbmDIB) + DeleteObject( fb->hbmDIB ); + + fb->hbmDIB = CreateCompatibleBitmap( + fb->hDC, + width, + height ); + } + + st_resize_framebuffer( fb->stfb, width, height ); + } + + static struct stw_framebuffer *fb_head = NULL; + + static LRESULT CALLBACK + window_proc( + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam ) + { + struct stw_framebuffer *fb; + + for (fb = fb_head; fb != NULL; fb = fb->next) + if (fb->hWnd == hWnd) + break; + assert( fb != NULL ); + + if (uMsg == WM_SIZE && wParam != SIZE_MINIMIZED) + framebuffer_resize( fb, LOWORD( lParam ), HIWORD( lParam ) ); + + return CallWindowProc( fb->WndProc, hWnd, uMsg, wParam, lParam ); + } + + /* Create a new framebuffer object which will correspond to the given HDC. + */ + struct stw_framebuffer * + framebuffer_create( + HDC hdc, + GLvisual *visual, + GLuint width, + GLuint height ) + { + struct stw_framebuffer *fb; + enum pipe_format colorFormat, depthFormat, stencilFormat; + + fb = CALLOC_STRUCT( stw_framebuffer ); + if (fb == NULL) + return NULL; + + /* Determine PIPE_FORMATs for buffers. + */ + colorFormat = PIPE_FORMAT_A8R8G8B8_UNORM; + + if (visual->depthBits == 0) + depthFormat = PIPE_FORMAT_NONE; + else if (visual->depthBits <= 16) + depthFormat = PIPE_FORMAT_Z16_UNORM; + else if (visual->depthBits <= 24) + depthFormat = PIPE_FORMAT_S8Z24_UNORM; + else + depthFormat = PIPE_FORMAT_Z32_UNORM; + + if (visual->stencilBits == 8) { + if (depthFormat == PIPE_FORMAT_S8Z24_UNORM) + stencilFormat = depthFormat; + else + stencilFormat = PIPE_FORMAT_S8_UNORM; + } + else { + stencilFormat = PIPE_FORMAT_NONE; + } + + fb->stfb = st_create_framebuffer( + visual, + colorFormat, + depthFormat, + stencilFormat, + width, + height, + (void *) fb ); + + fb->cColorBits = GetDeviceCaps( hdc, BITSPIXEL ); + fb->hDC = hdc; + + /* Subclass a window associated with the device context. + */ + fb->hWnd = WindowFromDC( hdc ); + if (fb->hWnd != NULL) { + fb->WndProc = (WNDPROC) SetWindowLong( + fb->hWnd, + GWL_WNDPROC, + (LONG) window_proc ); + } + + fb->next = fb_head; + fb_head = fb; + return fb; + } + + void + framebuffer_destroy( + struct stw_framebuffer *fb ) + { + struct stw_framebuffer **link = &fb_head; + struct stw_framebuffer *pfb = fb_head; + + while (pfb != NULL) { + if (pfb == fb) { + if (fb->hWnd != NULL) { + SetWindowLong( + fb->hWnd, + GWL_WNDPROC, + (LONG) fb->WndProc ); + } + + *link = fb->next; + FREE( fb ); + return; + } + + link = &pfb->next; + pfb = pfb->next; + } + } + + /* Given an hdc, return the corresponding stw_framebuffer. + */ + struct stw_framebuffer * + framebuffer_from_hdc( + HDC hdc ) + { + struct stw_framebuffer *fb; + + for (fb = fb_head; fb != NULL; fb = fb->next) + if (fb->hDC == hdc) + return fb; + return NULL; + } + + + BOOL + stw_swap_buffers( + HDC hdc ) + { + struct stw_framebuffer *fb; + struct pipe_surface *surf; + + fb = framebuffer_from_hdc( hdc ); + if (fb == NULL) + return FALSE; + + /* If we're swapping the buffer associated with the current context + * we have to flush any pending rendering commands first. + */ + st_notify_swapbuffers( fb->stfb ); + + st_get_framebuffer_surface( fb->stfb, ST_SURFACE_BACK_LEFT, &surf ); + - stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen->winsys, ++ stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen, + surf, + hdc ); + + return TRUE; + } diff --cc src/gallium/state_trackers/wgl/shared/stw_winsys.h index 00000000000,8557327ccdd..a85a9a22577 mode 000000,100644..100644 --- a/src/gallium/state_trackers/wgl/shared/stw_winsys.h +++ b/src/gallium/state_trackers/wgl/shared/stw_winsys.h @@@ -1,0 -1,60 +1,59 @@@ + /************************************************************************** + * + * 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. + * + **************************************************************************/ + + #ifndef STW_WINSYS_H + #define STW_WINSYS_H + + #include /* for HDC */ + + #include "pipe/p_compiler.h" + + struct pipe_screen; + struct pipe_context; -struct pipe_winsys; + struct pipe_surface; + + struct stw_winsys + { + struct pipe_screen * + (*create_screen)( void ); + + struct pipe_context * + (*create_context)( struct pipe_screen *screen ); + + void - (*flush_frontbuffer)( struct pipe_winsys *winsys, ++ (*flush_frontbuffer)( struct pipe_screen *screen, + struct pipe_surface *surf, + HDC hDC ); + }; + + boolean + st_init(const struct stw_winsys *stw_winsys); + + void + st_cleanup(void); + + #endif /* STW_WINSYS_H */