Mesa (master): r600_shader.c: check returned value of eg_get_interpolator_index

[Julien Isorce]

Module: Mesa
Branch: master
Commit: ad13bd2e51a5dc01b0f8a0eb927022f0deac0a0c
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad13bd2e51a5dc01b0f8a0eb927022f0deac0a0c

Author: Julien Isorce <julien.iso...@gmail.com>
Date:   Thu Mar 16 14:25:24 2017 +0000

r600_shader.c: check returned value of eg_get_interpolator_index

Like done in another place in that same file.

CID 1250588

Signed-off-by: Julien Isorce <jiso...@oblong.com>
Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 src/gallium/drivers/r600/r600_shader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c 
b/src/gallium/drivers/r600/r600_shader.c
index e97aa65141..844650220b 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1113,7 +1113,8 @@ static int allocate_system_value_inputs(struct 
r600_shader_ctx *ctx, int gpr_off
 
                                interpolate = 
ctx->info.input_interpolate[inst->Src[0].Register.Index];
                                k = eg_get_interpolator_index(interpolate, 
location);
-                               ctx->eg_interpolators[k].enabled = true;
+                                if (k >= 0)
+                                        ctx->eg_interpolators[k].enabled = 
true;
                        }
                } else if (parse.FullToken.Token.Type == 
TGSI_TOKEN_TYPE_DECLARATION) {
                        struct tgsi_full_declaration *d = 
&parse.FullToken.FullDeclaration;
@@ -1209,7 +1210,8 @@ static int evergreen_gpr_count(struct r600_shader_ctx 
*ctx)
 
                                interpolate = 
ctx->info.input_interpolate[inst->Src[0].Register.Index];
                                k = eg_get_interpolator_index(interpolate, 
location);
-                               ctx->eg_interpolators[k].enabled = true;
+                                if (k >= 0)
+                                        ctx->eg_interpolators[k].enabled = 
true;
                        }
                }
        }

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit