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
cc8a4532
Commit
cc8a4532
authored
Jul 28, 2010
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jul 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add casts for int to float conversions.
parent
6a87681b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+8
-8
No files found.
dlls/wined3d/arb_program_shader.c
View file @
cc8a4532
...
...
@@ -582,9 +582,9 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl)
if
(
gl_shader
->
int_consts
[
i
]
!=
WINED3D_CONST_NUM_UNUSED
)
{
float
val
[
4
];
val
[
0
]
=
stateBlock
->
pixelShaderConstantI
[
4
*
i
];
val
[
1
]
=
stateBlock
->
pixelShaderConstantI
[
4
*
i
+
1
];
val
[
2
]
=
stateBlock
->
pixelShaderConstantI
[
4
*
i
+
2
];
val
[
0
]
=
(
float
)
stateBlock
->
pixelShaderConstantI
[
4
*
i
];
val
[
1
]
=
(
float
)
stateBlock
->
pixelShaderConstantI
[
4
*
i
+
1
];
val
[
2
]
=
(
float
)
stateBlock
->
pixelShaderConstantI
[
4
*
i
+
2
];
val
[
3
]
=
-
1
.
0
f
;
GL_EXTCALL
(
glProgramLocalParameter4fvARB
(
GL_FRAGMENT_PROGRAM_ARB
,
gl_shader
->
int_consts
[
i
],
val
));
...
...
@@ -614,9 +614,9 @@ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl)
if
(
gl_shader
->
int_consts
[
i
]
!=
WINED3D_CONST_NUM_UNUSED
)
{
float
val
[
4
];
val
[
0
]
=
stateBlock
->
vertexShaderConstantI
[
4
*
i
];
val
[
1
]
=
stateBlock
->
vertexShaderConstantI
[
4
*
i
+
1
];
val
[
2
]
=
stateBlock
->
vertexShaderConstantI
[
4
*
i
+
2
];
val
[
0
]
=
(
float
)
stateBlock
->
vertexShaderConstantI
[
4
*
i
];
val
[
1
]
=
(
float
)
stateBlock
->
vertexShaderConstantI
[
4
*
i
+
1
];
val
[
2
]
=
(
float
)
stateBlock
->
vertexShaderConstantI
[
4
*
i
+
2
];
val
[
3
]
=
-
1
.
0
f
;
GL_EXTCALL
(
glProgramLocalParameter4fvARB
(
GL_VERTEX_PROGRAM_ARB
,
gl_shader
->
int_consts
[
i
],
val
));
...
...
@@ -1058,7 +1058,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction
else
if
(
reg
->
idx
>=
rel_offset
)
sprintf
(
register_name
,
"C[%s + %u]"
,
rel_reg
,
reg
->
idx
-
rel_offset
);
else
sprintf
(
register_name
,
"C[%s - %u]"
,
rel_reg
,
-
reg
->
idx
+
rel_offset
);
sprintf
(
register_name
,
"C[%s - %u]"
,
rel_reg
,
rel_offset
-
reg
->
idx
);
}
else
{
...
...
@@ -6981,7 +6981,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
GLenum
shader
;
IWineD3DDeviceImpl
*
device
=
(
IWineD3DDeviceImpl
*
)
iface
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
float
size
[
4
]
=
{
surface
->
pow2Width
,
surface
->
pow2Height
,
1
,
1
};
float
size
[
4
]
=
{
(
float
)
surface
->
pow2Width
,
(
float
)
surface
->
pow2Height
,
1
.
0
f
,
1
.
0
f
};
struct
arbfp_blit_priv
*
priv
=
device
->
blit_priv
;
enum
complex_fixup
fixup
;
GLenum
textype
=
surface
->
texture_target
;
...
...
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