From: Matt Turner <mattst88@gmail.com>
Date: Thu, 20 Feb 2014 16:19:19 +0000 (-0800)
Subject: i965/fs: Move setting opcode = NOP to its one useful location.
X-Git-Tag: upstream/10.3~3477
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=070f20272fcfdcafe5d843d240e876ef5cfda560;p=platform%2Fupstream%2Fmesa.git

i965/fs: Move setting opcode = NOP to its one useful location.

All other callers of init() immediately set opcode to something else.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 2ffeffa..dfb59aa 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -55,7 +55,6 @@ void
 fs_inst::init()
 {
    memset(this, 0, sizeof(*this));
-   this->opcode = BRW_OPCODE_NOP;
    this->conditional_mod = BRW_CONDITIONAL_NONE;
 
    this->dst = reg_undef;
@@ -70,6 +69,7 @@ fs_inst::init()
 fs_inst::fs_inst()
 {
    init();
+   this->opcode = BRW_OPCODE_NOP;
 }
 
 fs_inst::fs_inst(enum opcode opcode)