Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
59eba5cb
Commit
59eba5cb
authored
Oct 28, 2007
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Oct 29, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Default to GLSL. This is safe because we now have proper ps2.0/vs2.0 detection.
parent
efc18d79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
directx.c
dlls/wined3d/directx.c
+7
-1
wined3d_main.c
dlls/wined3d/wined3d_main.c
+3
-7
No files found.
dlls/wined3d/directx.c
View file @
59eba5cb
...
...
@@ -335,7 +335,13 @@ static void select_shader_mode(
if
(
wined3d_settings
.
vs_mode
==
VS_NONE
)
{
*
vs_selected
=
SHADER_NONE
;
}
else
if
(
gl_info
->
supported
[
ARB_VERTEX_SHADER
]
&&
wined3d_settings
.
glslRequested
)
{
*
vs_selected
=
SHADER_GLSL
;
/* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are
* wrong. This combined with the fact that glsl won't offer more features or performance, use ARB
* shaders only on this card. */
if
(
gl_info
->
vs_nv_version
<
VS_VERSION_20
)
*
vs_selected
=
SHADER_ARB
;
else
*
vs_selected
=
SHADER_GLSL
;
}
else
if
(
gl_info
->
supported
[
ARB_VERTEX_PROGRAM
])
{
*
vs_selected
=
SHADER_ARB
;
}
else
{
...
...
dlls/wined3d/wined3d_main.c
View file @
59eba5cb
...
...
@@ -39,7 +39,7 @@ wined3d_settings_t wined3d_settings =
VS_HW
,
/* Hardware by default */
PS_HW
,
/* Hardware by default */
VBO_HW
,
/* Hardware by default */
FALSE
,
/* Use of GLSL dis
abled by default */
TRUE
,
/* Use of GLSL en
abled by default */
ORM_BACKBUFFER
,
/* Use the backbuffer to do offscreen rendering */
RTL_AUTO
,
/* Automatically determine best locking method */
0
,
/* The default of memory is set in FillGLCaps */
...
...
@@ -184,14 +184,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
}
if
(
!
get_config_key
(
hkey
,
appkey
,
"UseGLSL"
,
buffer
,
size
)
)
{
if
(
!
strcmp
(
buffer
,
"enabled"
))
{
TRACE
(
"Use of GL Shading Language enabled for systems that support it
\n
"
);
wined3d_settings
.
glslRequested
=
TRUE
;
}
else
if
(
!
strcmp
(
buffer
,
"disabled"
))
{
TRACE
(
"Use of GL Shading Language disabled
\n
"
);
wined3d_settings
.
glslRequested
=
FALSE
;
}
}
if
(
!
get_config_key
(
hkey
,
appkey
,
"OffscreenRenderingMode"
,
buffer
,
size
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment