X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fstate_trackers%2Fwgl%2Fstw_device.c;h=d88b37f7225b36d2136efbe6888a114e7acfe617;hb=5f0b984cb8fd424facc7b245e4649b38f4815e3c;hp=445db9cd9b844bd8e237d84f3468ba6cd8be20cd;hpb=e1510d48165abbfdbe5036b6eb1e4ae89b4ad5fb;p=mesa.git diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c index 445db9cd9b8..d88b37f7225 100644 --- a/src/gallium/state_trackers/wgl/stw_device.c +++ b/src/gallium/state_trackers/wgl/stw_device.c @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2008 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * 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 + * IN NO EVENT SHALL VMWARE 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. @@ -48,17 +48,49 @@ static int stw_get_param(struct st_manager *smapi, enum st_manager_param param) { - return 0; + switch (param) { + case ST_MANAGER_BROKEN_INVALIDATE: + /* + * Force framebuffer validation on glViewport. + * + * Certain applications, like Rhinoceros 4, uses glReadPixels + * exclusively (never uses SwapBuffers), so framebuffers never get + * resized unless we check on glViewport. + */ + return 1; + default: + return 0; + } } + +/** Get the refresh rate for the monitor, in Hz */ +static int +get_refresh_rate(void) +{ + DEVMODE devModes; + + if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devModes)) { + /* clamp the value, just in case we get garbage */ + return CLAMP(devModes.dmDisplayFrequency, 30, 120); + } + else { + /* reasonable default */ + return 60; + } +} + + boolean stw_init(const struct stw_winsys *stw_winsys) { static struct stw_device stw_dev_storage; struct pipe_screen *screen; + debug_disable_error_message_boxes(); + debug_printf("%s\n", __FUNCTION__); - + assert(!stw_dev); stw_tls_init(); @@ -69,7 +101,7 @@ stw_init(const struct stw_winsys *stw_winsys) #ifdef DEBUG stw_dev->memdbg_no = debug_memory_begin(); #endif - + stw_dev->stw_winsys = stw_winsys; stw_dev->stapi = stw_st_create_api(); @@ -78,22 +110,22 @@ stw_init(const struct stw_winsys *stw_winsys) goto error1; screen = stw_winsys->create_screen(); - if(!screen) + if (!screen) goto error1; - if(stw_winsys->get_adapter_luid) + if (stw_winsys->get_adapter_luid) stw_winsys->get_adapter_luid(screen, &stw_dev->AdapterLuid); stw_dev->smapi->screen = screen; stw_dev->smapi->get_param = stw_get_param; stw_dev->screen = screen; - stw_dev->max_2d_levels = - screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS); + stw_dev->max_2d_levels = util_last_bit(screen->get_param(screen, + PIPE_CAP_MAX_TEXTURE_2D_SIZE)); stw_dev->max_2d_length = 1 << (stw_dev->max_2d_levels - 1); - pipe_mutex_init( stw_dev->ctx_mutex ); - pipe_mutex_init( stw_dev->fb_mutex ); + InitializeCriticalSection(&stw_dev->ctx_mutex); + InitializeCriticalSection(&stw_dev->fb_mutex); stw_dev->ctx_table = handle_table_create(); if (!stw_dev->ctx_table) { @@ -102,11 +134,19 @@ stw_init(const struct stw_winsys *stw_winsys) stw_pixelformat_init(); + /* env var override for WGL_EXT_swap_control, useful for testing/debugging */ + const char *s = os_get_option("WGL_SWAP_INTERVAL"); + if (s) { + stw_dev->swap_interval = atoi(s); + } + stw_dev->refresh_rate = get_refresh_rate(); + + stw_dev->initialized = true; + return TRUE; error1: - if (stw_dev->smapi) - FREE(stw_dev->smapi); + FREE(stw_dev->smapi); if (stw_dev->stapi) stw_dev->stapi->destroy(stw_dev->stapi); @@ -138,14 +178,14 @@ stw_cleanup(void) if (!stw_dev) return; - + /* * Abort cleanup if there are still active contexts. In some situations * this DLL may be unloaded before the DLL that is using GL contexts is. */ - pipe_mutex_lock( stw_dev->ctx_mutex ); + stw_lock_contexts(stw_dev); dhglrc = handle_table_get_first_handle(stw_dev->ctx_table); - pipe_mutex_unlock( stw_dev->ctx_mutex ); + stw_unlock_contexts(stw_dev); if (dhglrc) { debug_printf("%s: contexts still active -- cleanup aborted\n", __FUNCTION__); stw_dev = NULL; @@ -155,10 +195,13 @@ stw_cleanup(void) handle_table_destroy(stw_dev->ctx_table); stw_framebuffer_cleanup(); - - pipe_mutex_destroy( stw_dev->fb_mutex ); - pipe_mutex_destroy( stw_dev->ctx_mutex ); - + + DeleteCriticalSection(&stw_dev->fb_mutex); + DeleteCriticalSection(&stw_dev->ctx_mutex); + + if (stw_dev->smapi->destroy) + stw_dev->smapi->destroy(stw_dev->smapi); + FREE(stw_dev->smapi); stw_dev->stapi->destroy(stw_dev->stapi); @@ -179,23 +222,8 @@ stw_cleanup(void) } -struct stw_context * -stw_lookup_context_locked( DHGLRC dhglrc ) -{ - if (dhglrc == 0) - return NULL; - - if (stw_dev == NULL) - return NULL; - - return (struct stw_context *) handle_table_get(stw_dev->ctx_table, dhglrc); -} - - void APIENTRY -DrvSetCallbackProcs( - INT nProcs, - PROC *pProcs ) +DrvSetCallbackProcs(INT nProcs, PROC *pProcs) { size_t size; @@ -210,9 +238,16 @@ DrvSetCallbackProcs( BOOL APIENTRY -DrvValidateVersion( - ULONG ulVersion ) +DrvValidateVersion(ULONG ulVersion) { - /* TODO: get the expected version from the winsys */ - return ulVersion == 1; + /* ulVersion is the version reported by the KMD: + * - via D3DKMTQueryAdapterInfo(KMTQAITYPE_UMOPENGLINFO) on WDDM, + * - or ExtEscape on XPDM and can be used to ensure the KMD and OpenGL ICD + * versions match. + * + * We should get the expected version number from the winsys, but for now + * ignore it. + */ + (void)ulVersion; + return TRUE; }