summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/ilo/shader
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers/ilo/shader')
-rw-r--r--src/gallium/drivers/ilo/shader/ilo_shader_internal.h2
-rw-r--r--src/gallium/drivers/ilo/shader/toy_compiler.c2
-rw-r--r--src/gallium/drivers/ilo/shader/toy_compiler.h8
-rw-r--r--src/gallium/drivers/ilo/shader/toy_compiler_asm.c6
-rw-r--r--src/gallium/drivers/ilo/shader/toy_compiler_disasm.c8
5 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h
index c55fde78ef0..d2dc2f5b5b4 100644
--- a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h
+++ b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h
@@ -158,7 +158,7 @@ struct ilo_shader {
* Information about a shader state.
*/
struct ilo_shader_info {
- const struct ilo_dev_info *dev;
+ const struct ilo_dev *dev;
int type;
const struct tgsi_token *tokens;
diff --git a/src/gallium/drivers/ilo/shader/toy_compiler.c b/src/gallium/drivers/ilo/shader/toy_compiler.c
index a3e0897f997..a4c2a2c4e20 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler.c
+++ b/src/gallium/drivers/ilo/shader/toy_compiler.c
@@ -535,7 +535,7 @@ tc_init_inst_templ(struct toy_compiler *tc)
* Initialize the toy compiler.
*/
void
-toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev_info *dev)
+toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev *dev)
{
memset(tc, 0, sizeof(*tc));
diff --git a/src/gallium/drivers/ilo/shader/toy_compiler.h b/src/gallium/drivers/ilo/shader/toy_compiler.h
index 9397c20d98e..d9b56174baf 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler.h
+++ b/src/gallium/drivers/ilo/shader/toy_compiler.h
@@ -150,7 +150,7 @@ struct toy_compaction_table {
* Toy compiler.
*/
struct toy_compiler {
- const struct ilo_dev_info *dev;
+ const struct ilo_dev *dev;
struct toy_inst templ;
struct util_slab_mempool mempool;
@@ -468,7 +468,7 @@ tc_fail(struct toy_compiler *tc, const char *reason)
}
void
-toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev_info *dev);
+toy_compiler_init(struct toy_compiler *tc, const struct ilo_dev *dev);
void
toy_compiler_cleanup(struct toy_compiler *tc);
@@ -480,10 +480,10 @@ void *
toy_compiler_assemble(struct toy_compiler *tc, int *size);
const struct toy_compaction_table *
-toy_compiler_get_compaction_table(const struct ilo_dev_info *dev);
+toy_compiler_get_compaction_table(const struct ilo_dev *dev);
void
-toy_compiler_disassemble(const struct ilo_dev_info *dev,
+toy_compiler_disassemble(const struct ilo_dev *dev,
const void *kernel, int size,
bool dump_hex);
diff --git a/src/gallium/drivers/ilo/shader/toy_compiler_asm.c b/src/gallium/drivers/ilo/shader/toy_compiler_asm.c
index 1f465a3b13b..ae1b135e83e 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler_asm.c
+++ b/src/gallium/drivers/ilo/shader/toy_compiler_asm.c
@@ -31,7 +31,7 @@
#define CG_REG_NUM(origin) ((origin) >> CG_REG_SHIFT)
struct codegen {
- const struct ilo_dev_info *dev;
+ const struct ilo_dev *dev;
const struct toy_inst *inst;
int pc;
@@ -402,7 +402,7 @@ static const struct toy_compaction_table toy_compaction_table_gen8 = {
};
const struct toy_compaction_table *
-toy_compiler_get_compaction_table(const struct ilo_dev_info *dev)
+toy_compiler_get_compaction_table(const struct ilo_dev *dev)
{
switch (ilo_dev_gen(dev)) {
case ILO_GEN(8):
@@ -1028,7 +1028,7 @@ translate_swizzle(enum toy_swizzle swizzle)
* Prepare for generating an instruction.
*/
static void
-codegen_prepare(struct codegen *cg, const struct ilo_dev_info *dev,
+codegen_prepare(struct codegen *cg, const struct ilo_dev *dev,
const struct toy_inst *inst, int pc, int rect_linear_width)
{
int i;
diff --git a/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c b/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
index 8ec348bda5b..576cd2b3b22 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
+++ b/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
@@ -70,7 +70,7 @@ struct disasm_src_operand {
};
struct disasm_inst {
- const struct ilo_dev_info *dev;
+ const struct ilo_dev *dev;
unsigned has_jip:1;
unsigned has_uip:1;
@@ -1936,7 +1936,7 @@ disasm_printer_print_inst(struct disasm_printer *printer,
}
static void
-disasm_uncompact_3src(const struct ilo_dev_info *dev,
+disasm_uncompact_3src(const struct ilo_dev *dev,
uint64_t compact, uint32_t *dw)
{
const struct toy_compaction_table *tbl =
@@ -2014,7 +2014,7 @@ disasm_uncompact_3src(const struct ilo_dev_info *dev,
}
static void
-disasm_uncompact(const struct ilo_dev_info *dev,
+disasm_uncompact(const struct ilo_dev *dev,
uint64_t compact, uint32_t *dw)
{
const struct toy_compaction_table *tbl =
@@ -2109,7 +2109,7 @@ disasm_uncompact(const struct ilo_dev_info *dev,
}
void
-toy_compiler_disassemble(const struct ilo_dev_info *dev,
+toy_compiler_disassemble(const struct ilo_dev *dev,
const void *kernel, int size,
bool dump_hex)
{