KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: increase array size for shader inputs and outputs 

and add assertions to prevent buffer overflow. This fixes corruption
of the r600_shader struct.

NOTE: This is a candidate for the stable branches.
This commit is contained in:
Marek Olšák 2013-05-02 05:08:08 +02:00
parent 121c2c8983
commit da33f9b919
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/r600_shader.c
View File

@ -571,6 +571,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
switch (d->Declaration.File) {
case TGSI_FILE_INPUT:
i = ctx->shader->ninput;
assert(i < Elements(ctx->shader->input));
ctx->shader->ninput += count;
ctx->shader->input[i].name = d->Semantic.Name;
ctx->shader->input[i].sid = d->Semantic.Index;
@ -602,6 +603,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
break;
case TGSI_FILE_OUTPUT:
i = ctx->shader->noutput++;
assert(i < Elements(ctx->shader->output));
ctx->shader->output[i].name = d->Semantic.Name;
ctx->shader->output[i].sid = d->Semantic.Index;
ctx->shader->output[i].gpr = ctx->file_offset[TGSI_FILE_OUTPUT] + d->Range.First;

4
src/gallium/drivers/r600/r600_shader.h
View File

@ -45,8 +45,8 @@ struct r600_shader {
unsigned ninput;
unsigned noutput;
unsigned nlds;
struct r600_shader_io input[32];
struct r600_shader_io output[32];
struct r600_shader_io input[40];
struct r600_shader_io output[40];
boolean uses_kill;
boolean fs_write_all;
boolean two_side;