projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted casts to silence g++ warnings.
[mesa.git]
/
src
/
mesa
/
main
/
arbprogram.c
diff --git
a/src/mesa/main/arbprogram.c
b/src/mesa/main/arbprogram.c
index b4ebe01399fb19331e0e03094682e0af8a36f74e..8ebae9d7da7d79aa0959d0a7453702343bcc141e 100644
(file)
--- a/
src/mesa/main/arbprogram.c
+++ b/
src/mesa/main/arbprogram.c
@@
-196,7
+196,8
@@
_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
return;
}
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
return;
}
- _mesa_parse_arb_vertex_program(ctx, target, string, len, prog);
+ _mesa_parse_arb_vertex_program(ctx, target, (const GLubyte *) string,
+ len, prog);
}
else if (target == GL_FRAGMENT_PROGRAM_ARB
&& ctx->Extensions.ARB_fragment_program) {
}
else if (target == GL_FRAGMENT_PROGRAM_ARB
&& ctx->Extensions.ARB_fragment_program) {
@@
-205,7
+206,8
@@
_mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
return;
}
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(format)");
return;
}
- _mesa_parse_arb_fragment_program(ctx, target, string, len, prog);
+ _mesa_parse_arb_fragment_program(ctx, target, (const GLubyte *) string,
+ len, prog);
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)");
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)");