Am Montag, den 26.03.2018, 08:46 -0600 schrieb Brian Paul: > Reviewed-by: Brian Paul <[email protected]>
I forgot to mention: I can't push, could you take care of this? Thanks, Gert > > Sorry for the breakage. > > -Brian > > On 03/26/2018 02:17 AM, Gert Wollny wrote: > > Fixes: ec478cf9c31c3775a21cd7b5b4b5cdd9263bde9e > > st/mesa,tgsi: use enum tgsi_opcode > > Bugzilla: https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs > > .freedesktop.org_show-5Fbug.cgi-3Fid- > > 3D105737&d=DwIBAg&c=uilaK90D4TOVoH58JNXRgQ&r=Ie7_encNUsqxbSRbqbNgof > > w0ITcfE8JKfaUjIQhncGA&m=lq2W5BZEbroPgPpeg6LQhQDMza_vdl8IYWN8cSDPsBw > > &s=RbSoaOlqbBS4Vq039rA2vIel6dkwOkK7V2OhXuLlPdI&e= > > Signed-off-by: Gert Wollny <[email protected]> > > --- > > src/mesa/state_tracker/tests/st_tests_common.cpp | 6 +++--- > > src/mesa/state_tracker/tests/st_tests_common.h | 10 +++++----- > > 2 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/src/mesa/state_tracker/tests/st_tests_common.cpp > > b/src/mesa/state_tracker/tests/st_tests_common.cpp > > index ea01ca5555..63e3d6b2c4 100644 > > --- a/src/mesa/state_tracker/tests/st_tests_common.cpp > > +++ b/src/mesa/state_tracker/tests/st_tests_common.cpp > > @@ -43,7 +43,7 @@ using std::tuple; > > /* Implementation of helper and test classes */ > > void *FakeCodeline::mem_ctx = nullptr; > > > > -FakeCodeline::FakeCodeline(unsigned _op, const vector<int>& _dst, > > +FakeCodeline::FakeCodeline(tgsi_opcode _op, const vector<int>& > > _dst, > > const vector<int>& _src, const > > vector<int>&_to): > > op(_op), > > max_temp_id(0) > > @@ -59,7 +59,7 @@ FakeCodeline::FakeCodeline(unsigned _op, const > > vector<int>& _dst, > > > > } > > > > -FakeCodeline::FakeCodeline(unsigned _op, const > > vector<pair<int,int>>& _dst, > > +FakeCodeline::FakeCodeline(tgsi_opcode _op, const > > vector<pair<int,int>>& _dst, > > const vector<pair<int, const char *>>& > > _src, > > const vector<pair<int, const char > > *>>&_to, > > SWZ with_swizzle): > > @@ -84,7 +84,7 @@ FakeCodeline::FakeCodeline(unsigned _op, const > > vector<pair<int,int>>& _dst, > > }); > > } > > > > -FakeCodeline::FakeCodeline(unsigned _op, const > > vector<tuple<int,int,int>>& _dst, > > +FakeCodeline::FakeCodeline(tgsi_opcode _op, const > > vector<tuple<int,int,int>>& _dst, > > const vector<tuple<int,int,int>>& > > _src, > > const vector<tuple<int,int,int>>&_to, > > RA with_reladdr): > > op(_op), > > diff --git a/src/mesa/state_tracker/tests/st_tests_common.h > > b/src/mesa/state_tracker/tests/st_tests_common.h > > index 2e18832923..6d855fe581 100644 > > --- a/src/mesa/state_tracker/tests/st_tests_common.h > > +++ b/src/mesa/state_tracker/tests/st_tests_common.h > > @@ -40,15 +40,15 @@ struct RA {}; > > > > /* A line to describe a TGSI instruction for building mock > > shaders. */ > > struct FakeCodeline { > > - FakeCodeline(unsigned _op): op(_op), max_temp_id(0) {} > > - FakeCodeline(unsigned _op, const std::vector<int>& _dst, const > > std::vector<int>& _src, > > + FakeCodeline(tgsi_opcode _op): op(_op), max_temp_id(0) {} > > + FakeCodeline(tgsi_opcode _op, const std::vector<int>& _dst, > > const std::vector<int>& _src, > > const std::vector<int>&_to); > > > > - FakeCodeline(unsigned _op, const > > std::vector<std::pair<int,int>>& _dst, > > + FakeCodeline(tgsi_opcode _op, const > > std::vector<std::pair<int,int>>& _dst, > > const std::vector<std::pair<int, const char *>>& > > _src, > > const std::vector<std::pair<int, const char > > *>>&_to, SWZ with_swizzle); > > > > - FakeCodeline(unsigned _op, const > > std::vector<std::tuple<int,int,int>>& _dst, > > + FakeCodeline(tgsi_opcode _op, const > > std::vector<std::tuple<int,int,int>>& _dst, > > const std::vector<std::tuple<int,int,int>>& _src, > > const std::vector<std::tuple<int,int,int>>&_to, > > RA with_reladdr); > > > > @@ -78,7 +78,7 @@ private: > > template <typename st_reg> > > void read_reg(const st_reg& s); > > > > - unsigned op; > > + tgsi_opcode op; > > std::vector<st_dst_reg> dst; > > std::vector<st_src_reg> src; > > std::vector<st_src_reg> tex_offsets; > > > > _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
