Module: Mesa Branch: master Commit: f3ba98cb18b30bead9ae26716daadce77030c1a0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3ba98cb18b30bead9ae26716daadce77030c1a0
Author: Karol Herbst <[email protected]> Date: Sat May 11 14:26:06 2019 +0200 rename pipe_llvm_program_header to pipe_binary_program_header We want to use it for other formats as well, so give it a more generic name Signed-off-by: Karol Herbst <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> Reviewed-by: Pierre Moreau <[email protected]> --- src/gallium/drivers/r600/evergreen_compute.c | 2 +- src/gallium/drivers/radeonsi/si_compute.c | 2 +- src/gallium/include/pipe/p_state.h | 4 ++-- src/gallium/state_trackers/clover/llvm/codegen/common.cpp | 2 +- src/gallium/state_trackers/clover/spirv/invocation.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index 0f6c5c2f2ff..419738eec70 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -429,7 +429,7 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx, struct r600_context *rctx = (struct r600_context *)ctx; struct r600_pipe_compute *shader = CALLOC_STRUCT(r600_pipe_compute); #ifdef HAVE_OPENCL - const struct pipe_llvm_program_header *header; + const struct pipe_binary_program_header *header; void *p; boolean use_kill; #endif diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 037b1927189..9fe2bb5cf4b 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -256,7 +256,7 @@ static void *si_create_compute_state( &sel->compiler_ctx_state, program, si_create_compute_state_async); } else { - const struct pipe_llvm_program_header *header; + const struct pipe_binary_program_header *header; header = cso->prog; program->shader.binary.elf_size = header->num_bytes; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 4b23824f3de..b0d8eaed2fa 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -879,9 +879,9 @@ struct pipe_grid_info }; /** - * Structure used as a header for serialized LLVM programs. + * Structure used as a header for serialized compute programs. */ -struct pipe_llvm_program_header +struct pipe_binary_program_header { uint32_t num_bytes; /**< Number of bytes in the LLVM bytecode program. */ char blob[]; diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp index 98a9d5ffb5e..3879fb61a02 100644 --- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp +++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp @@ -177,7 +177,7 @@ namespace { module::section make_text_section(const std::vector<char> &code) { - const pipe_llvm_program_header header { uint32_t(code.size()) }; + const pipe_binary_program_header header { uint32_t(code.size()) }; module::section text { 0, module::section::text_executable, header.num_bytes, {} }; diff --git a/src/gallium/state_trackers/clover/spirv/invocation.cpp b/src/gallium/state_trackers/clover/spirv/invocation.cpp index 86916117b48..620c6b1e0ea 100644 --- a/src/gallium/state_trackers/clover/spirv/invocation.cpp +++ b/src/gallium/state_trackers/clover/spirv/invocation.cpp @@ -95,7 +95,7 @@ namespace { module::section make_text_section(const std::vector<char> &code, enum module::section::type section_type) { - const pipe_llvm_program_header header { uint32_t(code.size()) }; + const pipe_binary_program_header header { uint32_t(code.size()) }; module::section text { 0, section_type, header.num_bytes, {} }; text.data.insert(text.data.end(), reinterpret_cast<const char *>(&header), @@ -625,7 +625,7 @@ clover::spirv::link_program(const std::vector<module> &modules, sec.type == module::section::text_library; }, mod.secs); - const auto c_il = ((struct pipe_llvm_program_header*)msec.data.data())->blob; + const auto c_il = ((struct pipe_binary_program_header*)msec.data.data())->blob; const auto length = msec.size; sections.push_back(reinterpret_cast<const uint32_t *>(c_il)); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
