From: Matt Turner <mattst88@gmail.com>
Date: Mon, 16 May 2016 22:22:59 +0000 (-0700)
Subject: i965/fs: Assert that nir_op_extract_*'s src1 is a constant.
X-Git-Tag: upstream/17.1.0~9736
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbb0e3a7e8fffa4d5c5af8660d99cd3da8af97ec;p=platform%2Fupstream%2Fmesa.git

i965/fs: Assert that nir_op_extract_*'s src1 is a constant.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index ad20dc8..ebcc92a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -1384,6 +1384,7 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr)
    case nir_op_extract_u8:
    case nir_op_extract_i8: {
       nir_const_value *byte = nir_src_as_const_value(instr->src[1].src);
+      assert(byte != NULL);
       bld.emit(SHADER_OPCODE_EXTRACT_BYTE,
                result, op[0], brw_imm_ud(byte->u32[0]));
       break;
@@ -1392,6 +1393,7 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr)
    case nir_op_extract_u16:
    case nir_op_extract_i16: {
       nir_const_value *word = nir_src_as_const_value(instr->src[1].src);
+      assert(word != NULL);
       bld.emit(SHADER_OPCODE_EXTRACT_WORD,
                result, op[0], brw_imm_ud(word->u32[0]));
       break;