Mesa (master): aux/draw: replace binary HAVE_LLVM checks with LLVM_AVAILABLE
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Sep 6 21:41:58 UTC 2019
Module: Mesa
Branch: master
Commit: 28cb16b6f86718f16219218427b78981a9a4de65
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28cb16b6f86718f16219218427b78981a9a4de65
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Tue Aug 27 23:56:55 2019 +0100
aux/draw: replace binary HAVE_LLVM checks with LLVM_AVAILABLE
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Acked-by: Michel Dänzer <mdaenzer at redhat.com>
---
src/gallium/auxiliary/draw/draw_context.c | 16 ++++++++--------
src/gallium/auxiliary/draw/draw_context.h | 2 +-
src/gallium/auxiliary/draw/draw_gs.c | 18 +++++++++---------
src/gallium/auxiliary/draw/draw_gs.h | 6 +++---
src/gallium/auxiliary/draw/draw_private.h | 2 +-
src/gallium/auxiliary/draw/draw_pt.c | 4 ++--
src/gallium/auxiliary/draw/draw_vs.c | 2 +-
src/gallium/auxiliary/draw/draw_vs.h | 2 +-
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index 9de40d76221..db634b419a1 100644
--- a/src/gallium/auxiliary/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
@@ -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:
diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index 69138690de7..fefda821338 100644
--- a/src/gallium/auxiliary/draw/draw_context.h
+++ b/src/gallium/auxiliary/draw/draw_context.h
@@ -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
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index a75fe671777..94cfe860b6d 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -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)
{
diff --git a/src/gallium/auxiliary/draw/draw_gs.h b/src/gallium/auxiliary/draw/draw_gs.h
index 9a9154969f5..9a86910c1e6 100644
--- a/src/gallium/auxiliary/draw/draw_gs.h
+++ b/src/gallium/auxiliary/draw/draw_gs.h
@@ -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
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index 9be5f94db80..3aa355b179e 100644
--- a/src/gallium/auxiliary/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
@@ -46,7 +46,7 @@
#include "tgsi/tgsi_scan.h"
-#ifdef HAVE_LLVM
+#ifdef LLVM_AVAILABLE
struct gallivm_state;
#endif
diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index eeebca30ce7..88063ee5e48 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -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
{
diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c
index 415c4fa949a..802ff92b811 100644
--- a/src/gallium/auxiliary/draw/draw_vs.c
+++ b/src/gallium/auxiliary/draw/draw_vs.c
@@ -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);
}
diff --git a/src/gallium/auxiliary/draw/draw_vs.h b/src/gallium/auxiliary/draw/draw_vs.h
index 65520ea6e7a..c0c29002bba 100644
--- a/src/gallium/auxiliary/draw/draw_vs.h
+++ b/src/gallium/auxiliary/draw/draw_vs.h
@@ -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);
More information about the mesa-commit
mailing list