From: Brian Paul <brianp@vmware.com>
Date: Tue, 16 Jan 2018 15:40:36 +0000 (-0700)
Subject: mesa/program: change validate_inputs() local var 'inputs' to GLbitfield64
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad00a7899396dc56abb4f813487bb19100551348;p=mesa.git

mesa/program: change validate_inputs() local var 'inputs' to GLbitfield64

Both state->prog->info.inputs_read and state->InputsBound are GLbitfield64
so it seems that the OR of those values should be of the same type.
I'm not sure this fixes any actual issues though.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index 04ec18d840d..1bc5f515494 100644
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -2212,7 +2212,7 @@ set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,
 int
 validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)
 {
-   const GLbitfield inputs = state->prog->info.inputs_read | state->InputsBound;
+   const GLbitfield64 inputs = state->prog->info.inputs_read | state->InputsBound;
    GLbitfield ff_inputs = 0;
 
    /* Since Mesa internal attribute indices are different from