From 0161d6b636ab07a603cd6c2f6509e1995e4e2811 Mon Sep 17 00:00:00 2001 From: Jason Green Date: Fri, 26 May 2006 10:47:28 -0400 Subject: [PATCH] wined3d: Final move of the GLSL registry check (hopefully). --- dlls/wined3d/device.c | 11 ----------- dlls/wined3d/directx.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eff95040c9c..4a22275a2f3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1732,17 +1732,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_P IWineD3DDevice_SetViewport((IWineD3DDevice *)This, &vp); } - - /* Determine shader mode to use based on GL caps */ - if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested - && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_GLSL; - else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || - (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_ARB; - else - wined3d_settings.shader_mode = SHADER_SW; - /* Initialize the current view state */ This->modelview_valid = 1; This->proj_valid = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ec9c5d76664..d699d834acb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -746,6 +746,17 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { GLX_EXT_FUNCS_GEN; #undef USE_GL_FUNC + /* Determine shader mode to use based on GL caps */ + if (gl_info->supported[ARB_SHADING_LANGUAGE_100] && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((gl_info->supported[ARB_VERTEX_PROGRAM] && wined3d_settings.vs_mode == VS_HW) || + (gl_info->supported[ARB_FRAGMENT_PROGRAM] && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + + /* If we created a dummy context, throw it away */ if (NULL != fake_ctx) WineD3D_ReleaseFakeGLContext(fake_ctx); -- 2.11.4.GIT