AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon/ac: switch to ac_shader_binary_config_start()

Browse Source 
For radeonsi we could probably switch to
ac_shader_binary_read_config(). However the functions have
diverged so just share this helper for now.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri
2017-02-27 11:24:54 +11:00
parent f0aaa4b3a4
commit 503fb134e8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r600/evergreen_compute.c
+2 -1
View File
@@ -26,6 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include "ac_binary.h"
#include "pipe/p_defines.h" #include "pipe/p_defines.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
#include "pipe/p_context.h" #include "pipe/p_context.h"
@@ -187,7 +188,7 @@ static void r600_shader_binary_read_config(const struct ac_shader_binary *binary
{ {
unsigned i; unsigned i;
const unsigned char *config = const unsigned char *config =
radeon_shader_binary_config_start(binary, symbol_offset); ac_shader_binary_config_start(binary, symbol_offset);
for (i = 0; i < binary->config_size_per_symbol; i+= 8) { for (i = 0; i < binary->config_size_per_symbol; i+= 8) {
unsigned reg = unsigned reg =
src/gallium/drivers/radeonsi/si_shader.c
+2 -2
View File
@@ -33,13 +33,13 @@
#include "gallivm/lp_bld_arit.h" #include "gallivm/lp_bld_arit.h"
#include "gallivm/lp_bld_flow.h" #include "gallivm/lp_bld_flow.h"
#include "gallivm/lp_bld_misc.h" #include "gallivm/lp_bld_misc.h"
#include "radeon/radeon_elf_util.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/u_string.h" #include "util/u_string.h"
#include "tgsi/tgsi_build.h" #include "tgsi/tgsi_build.h"
#include "tgsi/tgsi_util.h" #include "tgsi/tgsi_util.h"
#include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_dump.h"
#include "ac_binary.h"
#include "ac_llvm_util.h" #include "ac_llvm_util.h"
#include "si_shader_internal.h" #include "si_shader_internal.h"
#include "si_pipe.h" #include "si_pipe.h"
@@ -5756,7 +5756,7 @@ void si_shader_binary_read_config(struct ac_shader_binary *binary,
{ {
unsigned i; unsigned i;
const unsigned char *config = const unsigned char *config =
radeon_shader_binary_config_start(binary, symbol_offset); ac_shader_binary_config_start(binary, symbol_offset);
bool really_needs_scratch = false; bool really_needs_scratch = false;
/* LLVM adds SGPR spills to the scratch size. /* LLVM adds SGPR spills to the scratch size.