diff options
author | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
commit | 6d3ef5c3fe5b69e59e3511202db6a66f71c2f234 (patch) | |
tree | 3830d989b529135e92edb6004aa368f287ed20c5 /mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | |
parent | cf506c799c2281867a28ac33ac985994918bc0ba (diff) | |
parent | 5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (diff) | |
download | vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.gz vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.bz2 vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 39717b6fd..9146f24f3 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -4028,7 +4028,7 @@ dst_register(struct st_translate *t, static struct ureg_src src_register(struct st_translate *t, gl_register_file file, - GLuint index) + GLint index) { switch(file) { case PROGRAM_UNDEFINED: @@ -4036,7 +4036,7 @@ src_register(struct st_translate *t, case PROGRAM_TEMPORARY: assert(index >= 0); - assert(index < Elements(t->temps)); + assert(index < (int) Elements(t->temps)); if (ureg_dst_is_undef(t->temps[index])) t->temps[index] = ureg_DECL_local_temporary(t->ureg); return ureg_src(t->temps[index]); @@ -4069,7 +4069,7 @@ src_register(struct st_translate *t, return ureg_src(t->address[index]); case PROGRAM_SYSTEM_VALUE: - assert(index < Elements(t->systemValues)); + assert(index < (int) Elements(t->systemValues)); return t->systemValues[index]; default: |