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 e5c6ac0a96afe7bfbafdbae99f2613194906b702..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;
       }
    }
@@ -226,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;
 
@@ -308,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);
 
@@ -332,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);