st/mesa: add a debug option to compile shaders at link time

v2: fix crashes

Tested-by: Tom Stellard <thomas.stellard@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index aa301d8308b656b99a3289c2f5a9f6992647d29b..c382d7d2ca3e6588469664a208dffcdb1581ac9a 100644 (file)
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -41,6 +41,7 @@
 #include "draw/draw_context.h"
 
 #include "st_context.h"
+#include "st_debug.h"
 #include "st_program.h"
 #include "st_mesa_to_tgsi.h"
 #include "st_cb_program.h"
@@ -214,6 +215,9 @@ st_program_string_notify( struct gl_context *ctx,
         st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
    }
 
+   if (ST_DEBUG & DEBUG_PRECOMPILE)
+      st_precompile_shader_variant(st, prog);
+
    /* XXX check if program is legal, within limits */
    return GL_TRUE;
 }

diff --git a/src/mesa/state_tracker/st_debug.c b/src/mesa/state_tracker/st_debug.c
index de3e3a9cdb293fbae95c56d2f8a38459ed76ffcf..50891c112cbef156054f49ff31562533bf72513a 100644 (file)
--- a/src/mesa/state_tracker/st_debug.c
+++ b/src/mesa/state_tracker/st_debug.c
@@ -56,6 +56,7 @@ static const struct debug_named_value st_debug_flags[] = {
    { "draw",     DEBUG_DRAW, NULL },
    { "buffer",   DEBUG_BUFFER, NULL },
    { "wf",       DEBUG_WIREFRAME, NULL },
+   { "precompile",  DEBUG_PRECOMPILE, NULL },
    DEBUG_NAMED_VALUE_END
 };
 

diff --git a/src/mesa/state_tracker/st_debug.h b/src/mesa/state_tracker/st_debug.h
index cc81978360cdc376137e50ca68eb74e9e400eecb..288eccf9f9ca9133d9058f4d2505c4954d758e35 100644 (file)
--- a/src/mesa/state_tracker/st_debug.h
+++ b/src/mesa/state_tracker/st_debug.h
@@ -47,6 +47,7 @@ st_print_current(void);
 #define DEBUG_DRAW      0x100
 #define DEBUG_BUFFER    0x200
 #define DEBUG_WIREFRAME 0x400
+#define DEBUG_PRECOMPILE   0x800
 
 #ifdef DEBUG
 extern int ST_DEBUG;

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 04258a1851c713bc415c41b000c6906380270572..111616d776e78d8318bd75f37cbe09684eab6f91 100644 (file)
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5383,7 +5383,8 @@ st_translate_program(
        * program constant) has to happen before creating this linkage.
        */
       for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
-         if (program->shader_program->_LinkedShaders[i] == NULL)
+         if (program->shader_program->_LinkedShaders[i] == NULL ||
+             program->shader_program->_LinkedShaders[i]->Program == NULL)
             continue;
 
          _mesa_associate_uniform_storage(ctx, program->shader_program,

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 3b0ac4ae7ef8e133b9558eb3eaa1b080d7a0fc8a..d93b3c7bcb86f5231352f0880b03fad4907352b0 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -185,9 +185,6 @@ st_prepare_vertex_program(struct gl_context *ctx,
    if (stvp->Base.IsPositionInvariant)
       _mesa_insert_mvp_code(ctx, &stvp->Base);
 
-   if (!stvp->glsl_to_tgsi)
-      assert(stvp->Base.Base.NumInstructions > 1);
-
    /*
     * Determine number of inputs, the mappings between VERT_ATTRIB_x
     * and TGSI generic input indexes, plus input attrib semantic info.
@@ -1318,3 +1315,47 @@ st_print_current_vertex_program(void)
       }
    }
 }
+
+
+/**
+ * Compile one shader variant.
+ */
+void
+st_precompile_shader_variant(struct st_context *st,
+                             struct gl_program *prog)
+{
+   switch (prog->Target) {
+   case GL_VERTEX_PROGRAM_ARB: {
+      struct st_vertex_program *p = (struct st_vertex_program *)prog;
+      struct st_vp_variant_key key;
+
+      memset(&key, 0, sizeof(key));
+      key.st = st;
+      st_get_vp_variant(st, p, &key);
+      break;
+   }
+
+   case GL_GEOMETRY_PROGRAM_NV: {
+      struct st_geometry_program *p = (struct st_geometry_program *)prog;
+      struct st_gp_variant_key key;
+
+      memset(&key, 0, sizeof(key));
+      key.st = st;
+      st_get_gp_variant(st, p, &key);
+      break;
+   }
+
+   case GL_FRAGMENT_PROGRAM_ARB: {
+      struct st_fragment_program *p = (struct st_fragment_program *)prog;
+      struct st_fp_variant_key key;
+
+      memset(&key, 0, sizeof(key));
+      key.st = st;
+      st_get_fp_variant(st, p, &key);
+      break;
+   }
+
+   default:
+      assert(0);
+   }
+}

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 451d7bb6a67d18ba91e9cc987571609217ec0a1a..b2c86faecb7d411b295911ecf15e5a64d85237ae 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -329,6 +329,9 @@ st_destroy_program_variants(struct st_context *st);
 extern void
 st_print_current_vertex_program(void);
 
+extern void
+st_precompile_shader_variant(struct st_context *st,
+                             struct gl_program *prog);
 
 #ifdef __cplusplus
 }