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
89509eb6
Commit
89509eb6
authored
Dec 01, 2008
by
Andrew Talbot
Committed by
Alexandre Julliard
Dec 01, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Sign-compare warnings fix.
parent
afb17f29
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
glsl_shader.c
dlls/wined3d/glsl_shader.c
+8
-9
No files found.
dlls/wined3d/glsl_shader.c
View file @
89509eb6
...
...
@@ -92,7 +92,7 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj)
{
int
infologLength
=
0
;
char
*
infoLog
;
int
i
;
unsigned
int
i
;
BOOL
is_spam
;
const
char
*
spam
[]
=
{
...
...
@@ -299,13 +299,13 @@ static void shader_glsl_load_constantsI(IWineD3DBaseShaderImpl *This, const Wine
GLhandleARB
programId
,
const
GLhandleARB
locations
[
MAX_CONST_I
],
unsigned
int
max_constants
,
const
int
*
constants
,
const
BOOL
*
constants_set
)
{
int
i
;
unsigned
int
i
;
struct
list
*
ptr
;
for
(
i
=
0
;
i
<
max_constants
;
++
i
)
{
if
(
NULL
==
constants_set
||
constants_set
[
i
])
{
TRACE_
(
d3d_constants
)(
"Loading constants %
i
: %i, %i, %i, %i
\n
"
,
TRACE_
(
d3d_constants
)(
"Loading constants %
u
: %i, %i, %i, %i
\n
"
,
i
,
constants
[
i
*
4
],
constants
[
i
*
4
+
1
],
constants
[
i
*
4
+
2
],
constants
[
i
*
4
+
3
]);
/* We found this uniform name in the program - go ahead and send the data */
...
...
@@ -339,7 +339,7 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine
GLhandleARB
programId
,
unsigned
int
max_constants
,
const
BOOL
*
constants
,
const
BOOL
*
constants_set
)
{
GLhandleARB
tmp_loc
;
int
i
;
unsigned
int
i
;
char
tmp_name
[
8
];
char
is_pshader
=
shader_is_pshader_version
(
This
->
baseShader
.
hex_version
);
const
char
*
prefix
=
is_pshader
?
"PB"
:
"VB"
;
...
...
@@ -348,11 +348,11 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine
for
(
i
=
0
;
i
<
max_constants
;
++
i
)
{
if
(
NULL
==
constants_set
||
constants_set
[
i
])
{
TRACE_
(
d3d_constants
)(
"Loading constants %
i
: %i;
\n
"
,
i
,
constants
[
i
]);
TRACE_
(
d3d_constants
)(
"Loading constants %
u
: %i;
\n
"
,
i
,
constants
[
i
]);
/* TODO: Benchmark and see if it would be beneficial to store the
* locations of the constants to avoid looking up each time */
snprintf
(
tmp_name
,
sizeof
(
tmp_name
),
"%s[%
i
]"
,
prefix
,
i
);
snprintf
(
tmp_name
,
sizeof
(
tmp_name
),
"%s[%
u
]"
,
prefix
,
i
);
tmp_loc
=
GL_EXTCALL
(
glGetUniformLocationARB
(
programId
,
tmp_name
));
if
(
tmp_loc
!=
-
1
)
{
/* We found this uniform name in the program - go ahead and send the data */
...
...
@@ -401,7 +401,7 @@ static void shader_glsl_load_constants(
const
struct
list
*
constant_list
;
GLhandleARB
programId
;
const
struct
glsl_shader_prog_link
*
prog
=
priv
->
glsl_program
;
unsigned
int
i
;
int
i
;
if
(
!
prog
)
{
/* No GLSL program set - nothing to do. */
...
...
@@ -503,8 +503,7 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s
{
IWineD3DBaseShaderImpl
*
This
=
(
IWineD3DBaseShaderImpl
*
)
iface
;
IWineD3DDeviceImpl
*
device
=
(
IWineD3DDeviceImpl
*
)
This
->
baseShader
.
device
;
int
i
;
unsigned
int
extra_constants_needed
=
0
;
unsigned
int
i
,
extra_constants_needed
=
0
;
const
local_constant
*
lconst
;
/* There are some minor differences between pixel and vertex shaders */
...
...
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