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
2381c952
Commit
2381c952
authored
Apr 05, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 06, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't use GLSL if the supported version isn't at least 1.20.
parent
ae623815
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
directx.c
dlls/wined3d/directx.c
+7
-1
utils.c
dlls/wined3d/utils.c
+4
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+3
-0
No files found.
dlls/wined3d/directx.c
View file @
2381c952
...
...
@@ -24,6 +24,7 @@
*/
#include "config.h"
#include <stdio.h>
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
...
...
@@ -31,7 +32,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_caps);
#define GLINFO_LOCATION (*gl_info)
#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024)
#define MAKEDWORD_VERSION(maj, min) ((maj & 0xffff) << 16) | (min & 0xffff)
/* The d3d device ID */
static
const
GUID
IID_D3DDEVICE_D3DUID
=
{
0xaeb2cdd4
,
0x6e41
,
0x43ea
,
{
0x94
,
0x1c
,
0x83
,
0x61
,
0xcc
,
0x76
,
0x07
,
0x81
}
};
...
...
@@ -2414,7 +2414,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter)
if
(
gl_info
->
supported
[
ARB_SHADING_LANGUAGE_100
])
{
const
char
*
str
=
(
const
char
*
)
glGetString
(
GL_SHADING_LANGUAGE_VERSION_ARB
);
unsigned
int
major
,
minor
;
TRACE_
(
d3d_caps
)(
"GLSL version string: %s.
\n
"
,
debugstr_a
(
str
));
/* The format of the GLSL version string is "major.minor[.release] [vendor info]". */
sscanf
(
str
,
"%u.%u"
,
&
major
,
&
minor
);
gl_info
->
glsl_version
=
MAKEDWORD_VERSION
(
major
,
minor
);
}
if
(
gl_info
->
supported
[
NV_LIGHT_MAX_EXPONENT
])
{
...
...
dlls/wined3d/utils.c
View file @
2381c952
...
...
@@ -2766,8 +2766,10 @@ UINT wined3d_log2i(UINT32 x)
* and the user preferences in wined3d_settings. */
void
select_shader_mode
(
const
struct
wined3d_gl_info
*
gl_info
,
int
*
ps_selected
,
int
*
vs_selected
)
{
BOOL
glsl
=
wined3d_settings
.
glslRequested
&&
gl_info
->
glsl_version
>=
MAKEDWORD_VERSION
(
1
,
20
);
if
(
wined3d_settings
.
vs_mode
==
VS_NONE
)
*
vs_selected
=
SHADER_NONE
;
else
if
(
gl_info
->
supported
[
ARB_VERTEX_SHADER
]
&&
wined3d_settings
.
glslRequested
)
else
if
(
gl_info
->
supported
[
ARB_VERTEX_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
...
...
@@ -2779,7 +2781,7 @@ void select_shader_mode(const struct wined3d_gl_info *gl_info, int *ps_selected,
else
*
vs_selected
=
SHADER_NONE
;
if
(
wined3d_settings
.
ps_mode
==
PS_NONE
)
*
ps_selected
=
SHADER_NONE
;
else
if
(
gl_info
->
supported
[
ARB_FRAGMENT_SHADER
]
&&
wined3d_settings
.
glslRequested
)
*
ps_selected
=
SHADER_GLSL
;
else
if
(
gl_info
->
supported
[
ARB_FRAGMENT_SHADER
]
&&
glsl
)
*
ps_selected
=
SHADER_GLSL
;
else
if
(
gl_info
->
supported
[
ARB_FRAGMENT_PROGRAM
])
*
ps_selected
=
SHADER_ARB
;
else
if
(
gl_info
->
supported
[
ATI_FRAGMENT_SHADER
])
*
ps_selected
=
SHADER_ATI
;
else
*
ps_selected
=
SHADER_NONE
;
...
...
dlls/wined3d/wined3d_private.h
View file @
2381c952
...
...
@@ -1418,6 +1418,7 @@ struct wined3d_gl_limits
struct
wined3d_gl_info
{
DWORD
glsl_version
;
UINT
vidmem
;
struct
wined3d_gl_limits
limits
;
DWORD
reserved_glsl_constants
;
...
...
@@ -3034,4 +3035,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface,
((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
#define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff))
#endif
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