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

aux/draw: replace binary HAVE_LLVM checks with LLVM_AVAILABLE 

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Eric Engestrom 2019-08-27 23:56:55 +01:00
parent ef434fbc25
commit 28cb16b6f8
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/auxiliary/draw/draw_context.c
View File

@ -45,7 +45,7 @@
#include "draw_vs.h"
#include "draw_gs.h"
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
#include "gallivm/lp_bld_init.h"
#include "gallivm/lp_bld_limits.h"
#include "draw_llvm.h"
@ -78,7 +78,7 @@ draw_create_context(struct pipe_context *pipe, void *context,
/* we need correct cpu caps for disabling denorms in draw_vbo() */
util_cpu_detect();
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (try_llvm && draw_get_option_use_llvm()) {
draw->llvm = draw_llvm_create(draw, (LLVMContextRef)context);
}
@ -112,7 +112,7 @@ draw_create(struct pipe_context *pipe)
}
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct draw_context *
draw_create_with_llvm_context(struct pipe_context *pipe,
void *context)
@ -220,7 +220,7 @@ void draw_destroy( struct draw_context *draw )
draw_pt_destroy( draw );
draw_vs_destroy( draw );
draw_gs_destroy( draw );
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm)
draw_llvm_destroy( draw->llvm );
#endif
@ -1027,7 +1027,7 @@ draw_set_samplers(struct draw_context *draw,
draw->num_samplers[shader_stage] = num;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm)
draw_llvm_set_sampler_state(draw, shader_stage);
#endif
@ -1065,7 +1065,7 @@ draw_set_mapped_texture(struct draw_context *draw,
uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS],
uint32_t mip_offsets[PIPE_MAX_TEXTURE_LEVELS])
{
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm)
draw_llvm_set_mapped_texture(draw,
shader_stage,
@ -1085,7 +1085,7 @@ draw_set_mapped_image(struct draw_context *draw,
uint32_t row_stride,
uint32_t img_stride)
{
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm)
draw_llvm_set_mapped_image(draw,
shader_stage,
@ -1123,7 +1123,7 @@ int
draw_get_shader_param(enum pipe_shader_type shader, enum pipe_shader_cap param)
{
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw_get_option_use_llvm()) {
switch(shader) {
case PIPE_SHADER_VERTEX:

2
src/gallium/auxiliary/draw/draw_context.h
View File

@ -65,7 +65,7 @@ struct draw_so_target {
struct draw_context *draw_create( struct pipe_context *pipe );
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct draw_context *draw_create_with_llvm_context(struct pipe_context *pipe,
void *context);
#endif

18
src/gallium/auxiliary/draw/draw_gs.c
View File

@ -29,7 +29,7 @@
#include "draw_private.h"
#include "draw_context.h"
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
#include "draw_llvm.h"
#endif
@ -239,7 +239,7 @@ static void tgsi_gs_run(struct draw_geometry_shader *shader,
}
}
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
static void
llvm_fetch_gs_input(struct draw_geometry_shader *shader,
@ -632,7 +632,7 @@ int draw_geometry_shader_run(struct draw_geometry_shader *shader,
shader->input = input;
shader->input_info = input_info;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (shader->draw->llvm) {
shader->gs_output = output_verts[0].verts;
if (max_out_prims > shader->max_out_prims) {
@ -765,14 +765,14 @@ struct draw_geometry_shader *
draw_create_geometry_shader(struct draw_context *draw,
const struct pipe_shader_state *state)
{
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
boolean use_llvm = draw->llvm != NULL;
struct llvm_geometry_shader *llvm_gs = NULL;
#endif
struct draw_geometry_shader *gs;
unsigned i;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (use_llvm) {
llvm_gs = CALLOC_STRUCT(llvm_geometry_shader);
@ -804,7 +804,7 @@ draw_create_geometry_shader(struct draw_context *draw,
/* setup the defaults */
gs->max_out_prims = 0;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (use_llvm) {
/* TODO: change the input array to handle the following
vector length, instead of the currently hardcoded
@ -861,7 +861,7 @@ draw_create_geometry_shader(struct draw_context *draw,
gs->num_vertex_streams = gs->state.stream_output.output[i].stream + 1;
}
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (use_llvm) {
int vector_size = gs->vector_length * sizeof(float);
gs->gs_input = align_malloc(sizeof(struct draw_gs_inputs), 16);
@ -921,7 +921,7 @@ void draw_delete_geometry_shader(struct draw_context *draw,
if (!dgs) {
return;
}
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm) {
struct llvm_geometry_shader *shader = llvm_geometry_shader(dgs);
struct draw_gs_llvm_variant_list_item *li;
@ -957,7 +957,7 @@ void draw_delete_geometry_shader(struct draw_context *draw,
}
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
void draw_gs_set_current_variant(struct draw_geometry_shader *shader,
struct draw_gs_llvm_variant *variant)
{

6
src/gallium/auxiliary/draw/draw_gs.h
View File

@ -36,7 +36,7 @@
struct draw_context;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct draw_gs_jit_context;
struct draw_gs_llvm_variant;
@ -96,7 +96,7 @@ struct draw_geometry_shader {
unsigned num_invocations;
unsigned invocation_id;
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct draw_gs_inputs *gs_input;
struct draw_gs_jit_context *jit_context;
struct draw_gs_llvm_variant *current_variant;
@ -146,7 +146,7 @@ void draw_geometry_shader_prepare(struct draw_geometry_shader *shader,
int draw_gs_max_output_vertices(struct draw_geometry_shader *shader,
unsigned pipe_prim);
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
void draw_gs_set_current_variant(struct draw_geometry_shader *shader,
struct draw_gs_llvm_variant *variant);
#endif

2
src/gallium/auxiliary/draw/draw_private.h
View File

@ -46,7 +46,7 @@
#include "tgsi/tgsi_scan.h"
#ifdef HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct gallivm_state;
#endif

4
src/gallium/auxiliary/draw/draw_pt.c
View File

@ -191,7 +191,7 @@ boolean draw_pt_init( struct draw_context *draw )
if (!draw->pt.middle.general)
return FALSE;
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->llvm)
draw->pt.middle.llvm = draw_pt_fetch_pipeline_or_emit_llvm( draw );
#endif
@ -522,7 +522,7 @@ draw_vbo(struct draw_context *draw,
draw->pt.vertex_element,
draw->pt.nr_vertex_elements,
info);
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (!draw->llvm)
#endif
{

2
src/gallium/auxiliary/draw/draw_vs.c
View File

@ -59,7 +59,7 @@ draw_create_vertex_shader(struct draw_context *draw,
tgsi_dump(shader->tokens, 0);
}
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
if (draw->pt.middle.llvm) {
vs = draw_create_vs_llvm(draw, shader);
}

2
src/gallium/auxiliary/draw/draw_vs.h
View File

@ -164,7 +164,7 @@ draw_create_vs_exec(struct draw_context *draw,
struct draw_vs_variant_key;
struct draw_vertex_shader;
#if HAVE_LLVM
#ifdef LLVM_AVAILABLE
struct draw_vertex_shader *
draw_create_vs_llvm(struct draw_context *draw,
const struct pipe_shader_state *state);