Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
0122cee5
Commit
0122cee5
authored
Apr 29, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
May 03, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make sure all fields of the shader backend caps are always initialized.
parent
c9e7561b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+11
-5
device.c
dlls/wined3d/device.c
+0
-1
directx.c
dlls/wined3d/directx.c
+0
-1
shader.c
dlls/wined3d/shader.c
+3
-0
No files found.
dlls/wined3d/arb_program_shader.c
View file @
0122cee5
...
...
@@ -4667,11 +4667,6 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh
DWORD
vs_consts
=
min
(
gl_info
->
limits
.
arb_vs_float_constants
,
gl_info
->
limits
.
arb_vs_native_constants
);
DWORD
ps_consts
=
min
(
gl_info
->
limits
.
arb_ps_float_constants
,
gl_info
->
limits
.
arb_ps_native_constants
);
/* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps,
* then overwrite the shader specific ones
*/
none_shader_backend
.
shader_get_caps
(
gl_info
,
pCaps
);
if
(
gl_info
->
supported
[
ARB_VERTEX_PROGRAM
])
{
if
(
gl_info
->
supported
[
NV_VERTEX_PROGRAM3
])
...
...
@@ -4692,6 +4687,11 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh
}
pCaps
->
MaxVertexShaderConst
=
vs_consts
;
}
else
{
pCaps
->
VertexShaderVersion
=
0
;
pCaps
->
MaxVertexShaderConst
=
0
;
}
if
(
gl_info
->
supported
[
ARB_FRAGMENT_PROGRAM
])
{
...
...
@@ -4714,6 +4714,12 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh
pCaps
->
PixelShader1xMaxValue
=
8
.
0
f
;
pCaps
->
MaxPixelShaderConst
=
ps_consts
;
}
else
{
pCaps
->
PixelShaderVersion
=
0
;
pCaps
->
PixelShader1xMaxValue
=
0
.
0
f
;
pCaps
->
MaxPixelShaderConst
=
0
;
}
pCaps
->
VSClipping
=
use_nv_clip
(
gl_info
);
}
...
...
dlls/wined3d/device.c
View file @
0122cee5
...
...
@@ -7086,7 +7086,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d,
select_shader_mode
(
&
adapter
->
gl_info
,
&
device
->
ps_selected_mode
,
&
device
->
vs_selected_mode
);
device
->
shader_backend
=
adapter
->
shader_backend
;
memset
(
&
shader_caps
,
0
,
sizeof
(
shader_caps
));
device
->
shader_backend
->
shader_get_caps
(
&
adapter
->
gl_info
,
&
shader_caps
);
device
->
d3d_vshader_constantF
=
shader_caps
.
MaxVertexShaderConst
;
device
->
d3d_pshader_constantF
=
shader_caps
.
MaxPixelShaderConst
;
...
...
dlls/wined3d/directx.c
View file @
0122cee5
...
...
@@ -4542,7 +4542,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
WINED3DPTFILTERCAPS_MAGFLINEAR
;
pCaps
->
VertexTextureFilterCaps
=
0
;
memset
(
&
shader_caps
,
0
,
sizeof
(
shader_caps
));
adapter
->
shader_backend
->
shader_get_caps
(
&
adapter
->
gl_info
,
&
shader_caps
);
adapter
->
fragment_pipe
->
get_caps
(
&
adapter
->
gl_info
,
&
fragment_caps
);
...
...
dlls/wined3d/shader.c
View file @
0122cee5
...
...
@@ -1418,8 +1418,11 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s
{
/* Set the shader caps to 0 for the none shader backend */
caps
->
VertexShaderVersion
=
0
;
caps
->
MaxVertexShaderConst
=
0
;
caps
->
PixelShaderVersion
=
0
;
caps
->
PixelShader1xMaxValue
=
0
.
0
f
;
caps
->
MaxPixelShaderConst
=
0
;
caps
->
VSClipping
=
FALSE
;
}
static
BOOL
shader_none_color_fixup_supported
(
struct
color_fixup_desc
fixup
)
...
...
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