Commit cec29b2a authored by David Schleef's avatar David Schleef

Fix ABI issues caused by 5bfde389

Although OrcVariable and OrcProgram are completely private,
orcc generates code that digs deep into OrcProgram for code_exec.
We're requiring that generated code is ABI compatible, so that
means the offset of code_exec in OrcProgram is part of the ABI.

Oops.
parent 440f38e1
......@@ -275,27 +275,9 @@ orc_compiler_c_assemble (OrcCompiler *compiler)
char s1[20], s2[20];
get_varname(s1, compiler, i);
get_varname_stride(s2, compiler, i);
switch (var->sampling_type) {
case ORC_SAMPLE_REGULAR:
ORC_ASM_CODE(compiler,
" ptr%d = ORC_PTR_OFFSET(%s, %s * j);\n",
i, s1, s2);
break;
case ORC_SAMPLE_TRANSPOSED:
ORC_ASM_CODE(compiler,
" ptr%d = ORC_PTR_OFFSET(%s, %d * j);\n",
i, s1, var->size);
break;
case ORC_SAMPLE_NEAREST:
case ORC_SAMPLE_BILINEAR:
case ORC_SAMPLE_FOUR_TAP:
ORC_ASM_CODE(compiler,
" ptr%d = ORC_PTR_OFFSET(%s, %s * j);\n",
i, s1, s2);
break;
default:
ORC_COMPILER_ERROR(compiler, "eeek");
}
ORC_ASM_CODE(compiler,
" ptr%d = ORC_PTR_OFFSET(%s, %s * j);\n",
i, s1, s2);
}
break;
case ORC_VAR_TYPE_DEST:
......
......@@ -430,7 +430,7 @@ void
orc_program_set_sampling_type (OrcProgram *program, int var,
int sampling_type)
{
program->vars[var].sampling_type = sampling_type;
/* This doesn't do anything yet */
}
/**
......
......@@ -205,10 +205,8 @@ struct _OrcVariable {
int ptr_offset;
int mask_alloc;
int aligned_data;
int sampling_type;
int load_dest;
double float_value;
int is_float_param;
int load_dest;
};
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment