replace _mesa_logbase2 with util_logbase2

[mesa.git] / src / mesa / state_tracker / st_program.h

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 62d82c2bf84bbac8f8f6be9b4d80c9e46050d74b..286fabc01172f772d9b80a1526d9ac50fe6152d3 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -71,9 +71,15 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog)
       unsigned unit = u_bit_scan(&mask);
       struct st_texture_object *stObj =
             st_get_texture_object(st->ctx, prog, unit);
+      enum pipe_format format = st_get_view_format(stObj);
 
-      switch (st_get_view_format(stObj)) {
+      /* if resource format matches then YUV wasn't lowered */
+      if (format == stObj->pt->format)
+         continue;
+
+      switch (format) {
       case PIPE_FORMAT_NV12:
+      case PIPE_FORMAT_P010:
       case PIPE_FORMAT_P016:
          key.lower_nv12 |= (1 << unit);
          break;
@@ -94,7 +100,7 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog)
          break;
       default:
          printf("mesa: st_get_external_sampler_key: unhandled pipe format %u\n",
-               st_get_view_format(stObj));
+                format);
          break;
       }
    }
@@ -190,36 +196,11 @@ struct st_common_variant_key
 
    /* for user-defined clip-planes */
    uint8_t lower_ucp;
-};
 
-
-/**
- * This represents a vertex program, especially translated to match
- * the inputs of a particular fragment shader.
- */
-struct st_vp_variant
-{
-   struct st_variant base;
-
-   /* Parameters which generated this translated version of a vertex
-    * shader:
-    */
-   struct st_common_variant_key key;
-
-   /**
-    * The shader variant saved for the draw module to later emulate
-    * selection/feedback/rasterpos.
+   /* Whether st_variant::driver_shader is for the draw module,
+    * not for the driver.
     */
-   const struct tgsi_token *tokens;
-
-   /** For using our private draw module (glRasterPos) */
-   struct draw_vertex_shader *draw_shader;
-
-   /** similar to that in st_vertex_program, but with edgeflags info too */
-   GLuint num_inputs;
-
-   /** Bitfield of VERT_BIT_* bits of mesa vertex processing inputs */
-   GLbitfield vert_attrib_mask;
+   bool is_draw_shader;
 };
 
 
@@ -232,6 +213,11 @@ struct st_common_variant
 
    /* Parameters which generated this variant. */
    struct st_common_variant_key key;
+
+   /* Bitfield of VERT_BIT_* bits matching vertex shader inputs,
+    * but not include the high part of doubles.
+    */
+   GLbitfield vert_attrib_mask;
 };
 
 
@@ -246,6 +232,9 @@ struct st_program
    struct ati_fragment_shader *ati_fs;
    uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */
 
+   void *serialized_nir;
+   unsigned serialized_nir_size;
+
    /* used when bypassing glsl_to_tgsi: */
    struct gl_shader_program *shader_program;
 
@@ -290,12 +279,6 @@ st_common_variant(struct st_variant *v)
    return (struct st_common_variant*)v;
 }
 
-static inline struct st_vp_variant *
-st_vp_variant(struct st_variant *v)
-{
-   return (struct st_vp_variant*)v;
-}
-
 static inline struct st_fp_variant *
 st_fp_variant(struct st_variant *v)
 {
@@ -315,7 +298,7 @@ st_get_generic_varying_index(struct st_context *st, GLuint attr)
 extern void
 st_set_prog_affected_state_flags(struct gl_program *prog);
 
-extern struct st_vp_variant *
+extern struct st_common_variant *
 st_get_vp_variant(struct st_context *st,
                   struct st_program *stvp,
                   const struct st_common_variant_key *key);
@@ -334,6 +317,9 @@ st_get_common_variant(struct st_context *st,
 extern void
 st_release_variants(struct st_context *st, struct st_program *p);
 
+extern void
+st_release_program(struct st_context *st, struct st_program **p);
+
 extern void
 st_destroy_program_variants(struct st_context *st);
 
@@ -358,6 +344,9 @@ extern bool
 st_translate_common_program(struct st_context *st,
                             struct st_program *stp);
 
+extern void
+st_serialize_nir(struct st_program *stp);
+
 extern void
 st_finalize_program(struct st_context *st, struct gl_program *prog);