diff options
| author | Eric Anholt <[email protected]> | 2014-08-24 14:05:37 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-09-04 11:39:51 -0700 |
| commit | 80b27ca2cd8cd2bb2937baa441c43a396887cc03 (patch) | |
| tree | a5e9e327cf986b60e6c3476f7b813467089a4990 /src/gallium/drivers/vc4/vc4_qir.c | |
| parent | 874dfa8b2ecccf3c9a73453d7ccc6638363a59bd (diff) | |
vc4: Switch to using native integers.
There were troubles with bools without using native integers
(st_glsl_to_tgsi seemed to think bool true was 1.0f sometimes, when as a
uniform it's stored as ~0), and since I've got native integers other than
divide, I might as well just support them.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_qir.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_qir.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_qir.c b/src/gallium/drivers/vc4/vc4_qir.c index 72149908422..93f97c219f7 100644 --- a/src/gallium/drivers/vc4/vc4_qir.c +++ b/src/gallium/drivers/vc4/vc4_qir.c @@ -38,10 +38,24 @@ static const struct qir_op_info qir_op_info[] = { [QOP_FADD] = { "fadd", 1, 2 }, [QOP_FSUB] = { "fsub", 1, 2 }, [QOP_FMUL] = { "fmul", 1, 2 }, + [QOP_MUL24] = { "mul24", 1, 2 }, [QOP_FMIN] = { "fmin", 1, 2 }, [QOP_FMAX] = { "fmax", 1, 2 }, [QOP_FMINABS] = { "fminabs", 1, 2 }, [QOP_FMAXABS] = { "fmaxabs", 1, 2 }, + [QOP_FTOI] = { "ftoi", 1, 1 }, + [QOP_ITOF] = { "itof", 1, 1 }, + [QOP_ADD] = { "add", 1, 2 }, + [QOP_SUB] = { "sub", 1, 2 }, + [QOP_SHR] = { "shr", 1, 2 }, + [QOP_ASR] = { "asr", 1, 2 }, + [QOP_SHL] = { "shl", 1, 2 }, + [QOP_MIN] = { "min", 1, 2 }, + [QOP_MAX] = { "max", 1, 2 }, + [QOP_AND] = { "and", 1, 2 }, + [QOP_OR] = { "or", 1, 2 }, + [QOP_XOR] = { "xor", 1, 2 }, + [QOP_NOT] = { "not", 1, 1 }, [QOP_SF] = { "sf", 0, 1 }, [QOP_SEL_X_0_NS] = { "fsel_x_0_ns", 1, 1 }, @@ -53,8 +67,6 @@ static const struct qir_op_info qir_op_info[] = { [QOP_SEL_X_Y_ZS] = { "fsel_x_y_zs", 1, 2 }, [QOP_SEL_X_Y_ZC] = { "fsel_x_y_zc", 1, 2 }, - [QOP_FTOI] = { "ftoi", 1, 1 }, - [QOP_ITOF] = { "itof", 1, 1 }, [QOP_RCP] = { "rcp", 1, 1 }, [QOP_RSQ] = { "rsq", 1, 1 }, [QOP_EXP2] = { "exp2", 1, 2 }, |