KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/fs: Clean up fs_inst constructors. 

In a fashion suggested by Ken.

Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Matt Turner 2014-05-27 10:25:05 -07:00
parent b1dcdcde2e
commit 07af0abef0
2 changed files with 31 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/mesa/drivers/dri/i965/brw_fs.cpp
View File

@ -52,95 +52,53 @@ extern "C" {
#include "glsl/glsl_types.h" #include "glsl/glsl_types.h"
void void
fs_inst::init(int sources) fs_inst::init(enum opcode opcode, const fs_reg &dst, fs_reg *src, int sources)
{ {
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
this->opcode = opcode;
this->dst = dst;
this->src = src;
this->sources = sources; this->sources = sources;
this->src = ralloc_array(this, fs_reg, sources);
this->conditional_mod = BRW_CONDITIONAL_NONE; this->conditional_mod = BRW_CONDITIONAL_NONE;
this->dst = reg_undef;
this->src[0] = reg_undef;
this->src[1] = reg_undef;
this->src[2] = reg_undef;
/* This will be the case for almost all instructions. */ /* This will be the case for almost all instructions. */
this->regs_written = 1; this->regs_written = 1;
this->writes_accumulator = false; this->writes_accumulator = false;
} }
fs_inst::fs_inst() fs_inst::fs_inst(enum opcode opcode, const fs_reg &dst)
{ {
init(3); fs_reg *src = ralloc_array(this, fs_reg, 3);
this->opcode = BRW_OPCODE_NOP; init(opcode, dst, src, 0);
} }
fs_inst::fs_inst(enum opcode opcode) fs_inst::fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0)
{ {
init(3); fs_reg *src = ralloc_array(this, fs_reg, 3);
this->opcode = opcode; src[0] = src0;
init(opcode, dst, src, 1);
} }
fs_inst::fs_inst(enum opcode opcode, fs_reg dst) fs_inst::fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0,
const fs_reg &src1)
{ {
init(3); fs_reg *src = ralloc_array(this, fs_reg, 3);
this->opcode = opcode; src[0] = src0;
this->dst = dst; src[1] = src1;
init(opcode, dst, src, 2);
if (dst.file == GRF)
assert(dst.reg_offset >= 0);
} }
fs_inst::fs_inst(enum opcode opcode, fs_reg dst, fs_reg src0) fs_inst::fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0,
const fs_reg &src1, const fs_reg &src2)
{ {
init(3); fs_reg *src = ralloc_array(this, fs_reg, 3);
this->opcode = opcode; src[0] = src0;
this->dst = dst; src[1] = src1;
this->src[0] = src0; src[2] = src2;
init(opcode, dst, src, 3);
if (dst.file == GRF)
assert(dst.reg_offset >= 0);
if (src[0].file == GRF)
assert(src[0].reg_offset >= 0);
}
fs_inst::fs_inst(enum opcode opcode, fs_reg dst, fs_reg src0, fs_reg src1)
{
init(3);
this->opcode = opcode;
this->dst = dst;
this->src[0] = src0;
this->src[1] = src1;
if (dst.file == GRF)
assert(dst.reg_offset >= 0);
if (src[0].file == GRF)
assert(src[0].reg_offset >= 0);
if (src[1].file == GRF)
assert(src[1].reg_offset >= 0);
}
fs_inst::fs_inst(enum opcode opcode, fs_reg dst,
fs_reg src0, fs_reg src1, fs_reg src2)
{
init(3);
this->opcode = opcode;
this->dst = dst;
this->src[0] = src0;
this->src[1] = src1;
this->src[2] = src2;
if (dst.file == GRF)
assert(dst.reg_offset >= 0);
if (src[0].file == GRF)
assert(src[0].reg_offset >= 0);
if (src[1].file == GRF)
assert(src[1].reg_offset >= 0);
if (src[2].file == GRF)
assert(src[2].reg_offset >= 0);
} }
fs_inst::fs_inst(const fs_inst &that) fs_inst::fs_inst(const fs_inst &that)

15
src/mesa/drivers/dri/i965/brw_fs.h
View File

@ -190,15 +190,14 @@ class fs_inst : public backend_instruction {
public: public:
DECLARE_RALLOC_CXX_OPERATORS(fs_inst) DECLARE_RALLOC_CXX_OPERATORS(fs_inst)
void init(int sources); void init(enum opcode opcode, const fs_reg &dst, fs_reg *src, int sources);
fs_inst(); fs_inst(enum opcode opcode = BRW_OPCODE_NOP, const fs_reg &dst = reg_undef);
fs_inst(enum opcode opcode); fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0);
fs_inst(enum opcode opcode, fs_reg dst); fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0,
fs_inst(enum opcode opcode, fs_reg dst, fs_reg src0); const fs_reg &src1);
fs_inst(enum opcode opcode, fs_reg dst, fs_reg src0, fs_reg src1); fs_inst(enum opcode opcode, const fs_reg &dst, const fs_reg &src0,
fs_inst(enum opcode opcode, fs_reg dst, const fs_reg &src1, const fs_reg &src2);
fs_reg src0, fs_reg src1,fs_reg src2);
fs_inst(const fs_inst &that); fs_inst(const fs_inst &that);
bool equals(fs_inst *inst) const; bool equals(fs_inst *inst) const;