ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix uniform name buffer overflows...

This commit is contained in:
espes 2015-07-17 13:49:31 +10:00
parent fe28f90556
commit d78ba60014
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xbox/nv2a.c
View File

@ -3156,26 +3156,26 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
/* For each texture stage */ /* For each texture stage */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
char name[16]; char name[32];
GLint loc; GLint loc;
/* Bump luminance only during stages 1 - 3 */ /* Bump luminance only during stages 1 - 3 */
if (i > 0) { if (i > 0) {
sprintf(name, "bumpMat%d", i); snprintf(name, sizeof(name), "bumpMat%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniformMatrix2fv(loc, 1, GL_FALSE, pg->bump_env_matrix[i - 1]); glUniformMatrix2fv(loc, 1, GL_FALSE, pg->bump_env_matrix[i - 1]);
} }
sprintf(name, "bumpScale%d", i); snprintf(name, sizeof(name), "bumpScale%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniform1f(loc, *(float*)&pg->regs[ glUniform1f(loc, *(float*)&pg->regs[
NV_PGRAPH_BUMPSCALE1 + (i - 1) * 4]); NV_PGRAPH_BUMPSCALE1 + (i - 1) * 4]);
} }
sprintf(name, "bumpOffset%d", i); snprintf(name, sizeof(name), "bumpOffset%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniform1f(loc, *(float*)&pg->regs[ glUniform1f(loc, *(float*)&pg->regs[
@ -3185,7 +3185,7 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
} }
/* Texture matrices */ /* Texture matrices */
sprintf(name, "texMat%d", i); snprintf(name, sizeof(name), "texMat%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniformMatrix4fv(loc, 1, GL_FALSE, pg->texture_matrix[i]); glUniformMatrix4fv(loc, 1, GL_FALSE, pg->texture_matrix[i]);
@ -3195,17 +3195,17 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
/* For each vertex weight */ /* For each vertex weight */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
char name[16]; char name[32];
GLint loc; GLint loc;
sprintf(name, "modelViewMat%d", i); snprintf(name, sizeof(name), "modelViewMat%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniformMatrix4fv(loc, 1, GL_FALSE, glUniformMatrix4fv(loc, 1, GL_FALSE,
pg->model_view_matrix[i]); pg->model_view_matrix[i]);
} }
sprintf(name, "invModelViewMat%d", i); snprintf(name, sizeof(name), "invModelViewMat%d", i);
loc = glGetUniformLocation(pg->shader_binding->gl_program, name); loc = glGetUniformLocation(pg->shader_binding->gl_program, name);
if (loc != -1) { if (loc != -1) {
glUniformMatrix4fv(loc, 1, GL_FALSE, glUniformMatrix4fv(loc, 1, GL_FALSE,