diff options
| author | Tom Stellard <[email protected]> | 2013-04-23 20:08:57 -0700 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-04-24 12:42:41 -0400 |
| commit | f64058803ad43e360ffaa5f14763485f4cac0158 (patch) | |
| tree | 46a8c123c76e4dbbaf2fdbf6f8a6707ccc090b84 /src/gallium/drivers/r600/r600_shader.c | |
| parent | e29525f79fdb62993e14a4bc87a9e0955b838de0 (diff) | |
r600g/llvm: Pass struct r600_bytecode to r600_llvm_compile
This way we don't need to update the function signature everytime we
emit a new config value. This also fixes the build with
--enable-opencl.
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 606dbeaf987..0204f805432 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -279,7 +279,7 @@ int r600_compute_shader_create(struct pipe_context * ctx, shader_ctx.bc->type = TGSI_PROCESSOR_COMPUTE; shader_ctx.bc->isa = r600_ctx->isa; r600_llvm_compile(mod, &bytes, &byte_count, r600_ctx->family, - &shader_ctx.bc->ngpr, dump); + shader_ctx.bc, dump); r600_bytecode_from_byte_stream(&shader_ctx, bytes, byte_count); if (shader_ctx.bc->chip_class == CAYMAN) { cm_bytecode_add_cf_end(shader_ctx.bc); @@ -1461,7 +1461,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, mod = r600_tgsi_llvm(&radeon_llvm_ctx, tokens); if (r600_llvm_compile(mod, &inst_bytes, &inst_byte_count, - rscreen->family, &ctx.bc->ngpr, &ctx.bc->nstack, dump)) { + rscreen->family, ctx.bc, dump)) { FREE(inst_bytes); radeon_llvm_dispose(&radeon_llvm_ctx); use_llvm = 0; |