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
e4183199
Commit
e4183199
authored
Jul 08, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix a sign compare warning in glsl_shader.c.
parent
949cd089
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+4
-4
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/glsl_shader.c
View file @
e4183199
...
@@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT
...
@@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT
}
}
}
}
static
int
vec4_varyings
(
DWORD
shader_major
,
const
WineD3D_GL_Info
*
gl_info
)
static
unsigned
int
vec4_varyings
(
DWORD
shader_major
,
const
WineD3D_GL_Info
*
gl_info
)
{
{
int
ret
=
GL_LIMITS
(
glsl_varyings
)
/
4
;
unsigned
int
ret
=
GL_LIMITS
(
glsl_varyings
)
/
4
;
/* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */
/* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */
if
(
shader_major
>
3
)
return
ret
;
if
(
shader_major
>
3
)
return
ret
;
...
@@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
...
@@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
if
(
This
->
baseShader
.
reg_maps
.
shader_version
.
major
>=
3
)
if
(
This
->
baseShader
.
reg_maps
.
shader_version
.
major
>=
3
)
{
{
DWORD
idx
=
((
IWineD3DPixelShaderImpl
*
)
This
)
->
input_reg_map
[
reg
->
idx
];
DWORD
idx
=
((
IWineD3DPixelShaderImpl
*
)
This
)
->
input_reg_map
[
reg
->
idx
];
DWORD
in_count
=
vec4_varyings
(
This
->
baseShader
.
reg_maps
.
shader_version
.
major
,
gl_info
);
unsigned
int
in_count
=
vec4_varyings
(
This
->
baseShader
.
reg_maps
.
shader_version
.
major
,
gl_info
);
if
(
reg
->
rel_addr
)
if
(
reg
->
rel_addr
)
{
{
...
@@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
...
@@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
UINT
semantic_idx_in
,
semantic_idx_out
;
UINT
semantic_idx_in
,
semantic_idx_out
;
DWORD
*
set
;
DWORD
*
set
;
DWORD
in_idx
;
DWORD
in_idx
;
DWORD
in_count
=
vec4_varyings
(
3
,
gl_info
);
unsigned
int
in_count
=
vec4_varyings
(
3
,
gl_info
);
char
reg_mask
[
6
],
reg_mask_out
[
6
];
char
reg_mask
[
6
],
reg_mask_out
[
6
];
char
destination
[
50
];
char
destination
[
50
];
WORD
input_map
,
output_map
;
WORD
input_map
,
output_map
;
...
...
dlls/wined3d/wined3d_private.h
View file @
e4183199
...
@@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl {
...
@@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl {
struct
wined3d_shader_signature_element
input_signature
[
MAX_REG_INPUT
];
struct
wined3d_shader_signature_element
input_signature
[
MAX_REG_INPUT
];
DWORD
input_reg_map
[
MAX_REG_INPUT
];
DWORD
input_reg_map
[
MAX_REG_INPUT
];
BOOL
input_reg_used
[
MAX_REG_INPUT
];
BOOL
input_reg_used
[
MAX_REG_INPUT
];
int
declared_in_count
;
unsigned
int
declared_in_count
;
/* The GL shader */
/* The GL shader */
void
*
backend_priv
;
void
*
backend_priv
;
...
...
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