OSDN Git Service

draw: (trivial) don't print the shader twice with GALLIVM_DEBUG=tgsi (or ir)
authorRoland Scheidegger <sroland@vmware.com>
Sat, 4 Apr 2015 14:49:08 +0000 (16:49 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Wed, 8 Apr 2015 23:32:30 +0000 (01:32 +0200)
Neither the shader nor the key change when doing elts or linear variant, so
this was just annoying (probably mildly useful at some point when we printed
the IR per function too).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
src/gallium/auxiliary/draw/draw_llvm.c

index 1e6e699..7150611 100644 (file)
@@ -562,6 +562,11 @@ draw_llvm_create_variant(struct draw_llvm *llvm,
 
    memcpy(&variant->key, key, shader->variant_key_size);
 
+   if (gallivm_debug & (GALLIVM_DEBUG_TGSI | GALLIVM_DEBUG_IR)) {
+      tgsi_dump(llvm->draw->vs.vertex_shader->state.tokens, 0);
+      draw_llvm_dump_variant_key(&variant->key);
+   }
+
    vertex_header = create_jit_vertex_header(variant->gallivm, num_inputs);
 
    variant->vertex_header_ptr_type = LLVMPointerType(vertex_header, 0);
@@ -606,11 +611,6 @@ generate_vs(struct draw_llvm_variant *variant,
    LLVMValueRef num_consts_ptr =
       draw_jit_context_num_vs_constants(variant->gallivm, context_ptr);
 
-   if (gallivm_debug & (GALLIVM_DEBUG_TGSI | GALLIVM_DEBUG_IR)) {
-      tgsi_dump(tokens, 0);
-      draw_llvm_dump_variant_key(&variant->key);
-   }
-
    lp_build_tgsi_soa(variant->gallivm,
                      tokens,
                      vs_type,