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
5f2c6b3c
Commit
5f2c6b3c
authored
Oct 25, 2011
by
Matteo Bruni
Committed by
Alexandre Julliard
Oct 26, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Enable SM4 support in the GLSL shader backend when possible.
parent
7254f5e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
directx.c
dlls/wined3d/directx.c
+2
-2
glsl_shader.c
dlls/wined3d/glsl_shader.c
+7
-1
No files found.
dlls/wined3d/directx.c
View file @
5f2c6b3c
...
...
@@ -4750,7 +4750,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
* are the same among all shader models. So to avoid code duplication set the shader version
* specific, but otherwise constant caps here
*/
if
(
caps
->
VertexShaderVersion
=
=
3
)
if
(
caps
->
VertexShaderVersion
>
=
3
)
{
/* Where possible set the caps based on OpenGL extensions and if they
* aren't set (in case of software rendering) use the VS 3.0 from
...
...
@@ -4787,7 +4787,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps
->
MaxVertexShader30InstructionSlots
=
0
;
}
if
(
caps
->
PixelShaderVersion
=
=
3
)
if
(
caps
->
PixelShaderVersion
>
=
3
)
{
/* Where possible set the caps based on OpenGL extensions and if they
* aren't set (in case of software rendering) use the PS 3.0 from
...
...
dlls/wined3d/glsl_shader.c
View file @
5f2c6b3c
...
...
@@ -4913,9 +4913,15 @@ static void shader_glsl_context_destroyed(void *shader_priv, const struct wined3
static
void
shader_glsl_get_caps
(
const
struct
wined3d_gl_info
*
gl_info
,
struct
shader_caps
*
caps
)
{
if
(
gl_info
->
supported
[
EXT_GPU_SHADER4
]
&&
gl_info
->
supported
[
ARB_GEOMETRY_SHADER4
]
&&
gl_info
->
glsl_version
>=
MAKEDWORD_VERSION
(
1
,
50
))
{
caps
->
VertexShaderVersion
=
4
;
caps
->
PixelShaderVersion
=
4
;
}
/* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3
* texldd and texldl instructions. */
if
(
gl_info
->
supported
[
ARB_SHADER_TEXTURE_LOD
]
||
gl_info
->
supported
[
EXT_GPU_SHADER4
])
else
if
(
gl_info
->
supported
[
ARB_SHADER_TEXTURE_LOD
]
||
gl_info
->
supported
[
EXT_GPU_SHADER4
])
{
caps
->
VertexShaderVersion
=
3
;
caps
->
PixelShaderVersion
=
3
;
...
...
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