Jason Green : wined3d: Move the GLSL registry check again.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri May 26 05:42:13 CDT 2006
Module: wine
Branch: master
Commit: cef19b57690db3957e054ffc7d761c8804cc9d76
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cef19b57690db3957e054ffc7d761c8804cc9d76
Author: Jason Green <jave27 at gmail.com>
Date: Fri May 26 00:33:13 2006 -0400
wined3d: Move the GLSL registry check again.
---
dlls/wined3d/device.c | 10 ++++++++++
dlls/wined3d/directx.c | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 07edde1..eff9504 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1733,6 +1733,16 @@ #endif
}
+ /* 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 0bb5589..ec9c5d7 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1696,16 +1696,6 @@ #endif
*pCaps->MaxStreams = MAX_STREAMS;
*pCaps->MaxStreamStride = 1024;
- /* 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;
-
if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL
&& DeviceType != WINED3DDEVTYPE_REF) {
*pCaps->VertexShaderVersion = D3DVS_VERSION(3,0);
More information about the wine-cvs
mailing list