Module: Mesa
Branch: master
Commit: a21da49e5c55f8e61253503d865cef936125ea5f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a21da49e5c55f8e61253503d865cef936125ea5f
Author: Gert Wollny <gw.foss...@gmail.com>
Date: Mon Mar 26 02:17:00 2018 -0600
mesa/st/tests: Use tgsi opcode enum also in the test classes
Fixes: ec478cf9c31K ("st/mesa,tgsi: use enum tgsi_opcode")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105737
Signed-off-by: Gert Wollny <gw.foss...@gmail.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
---
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-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
