Jason Green : wined3d: Final move of the GLSL registry check
(hopefully).
Alexandre Julliard
julliard at wine.codeweavers.com
Sat May 27 06:34:13 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 0161d6b636ab07a603cd6c2f6509e1995e4e2811
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0161d6b636ab07a603cd6c2f6509e1995e4e2811
Author: Jason Green <jave27 at gmail.com>
Date: Fri May 26 10:47:28 2006 -0400
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 eff9504..4a22275 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1732,17 +1732,6 @@ #endif
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 ec9c5d7..d699d83 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -746,6 +746,17 @@ #define USE_GL_FUNC(type, pfn) gl_info->
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);
More information about the wine-cvs
mailing list