From 9244c792f9aace6ea7a26fa8fbe7668d84a1f7d5 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 20 Dec 2021 14:52:24 +1000 Subject: [PATCH] mesa/dd: drop GetProgramBinaryDriverSHA1 Just call direct into state tracker Reviewed-by: Kristian H. Kristensen Part-of: --- src/mesa/main/dd.h | 2 -- src/mesa/main/program_binary.c | 6 ++++-- src/mesa/state_tracker/st_context.c | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index b13515c..80e110e 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -266,8 +266,6 @@ struct dd_function_table { /** * Calls to retrieve/store a binary serialized copy of the current program. */ - void (*GetProgramBinaryDriverSHA1)(struct gl_context *ctx, uint8_t *sha1); - void (*ProgramBinarySerializeDriverBlob)(struct gl_context *ctx, struct gl_shader_program *shProg, struct gl_program *prog); diff --git a/src/mesa/main/program_binary.c b/src/mesa/main/program_binary.c index 5362016..6aaa2c5 100644 --- a/src/mesa/main/program_binary.c +++ b/src/mesa/main/program_binary.c @@ -39,6 +39,8 @@ #include "program_binary.h" #include "program/prog_parameter.h" +#include "state_tracker/st_shader_cache.h" + /** * Mesa supports one binary format, but it must differentiate between formats * produced by different drivers and different Mesa versions. @@ -237,7 +239,7 @@ _mesa_get_program_binary(struct gl_context *ctx, uint8_t driver_sha1[20]; unsigned header_size = get_program_binary_header_size(); - ctx->Driver.GetProgramBinaryDriverSHA1(ctx, driver_sha1); + st_get_program_binary_driver_sha1(ctx, driver_sha1); blob_init(&blob); @@ -274,7 +276,7 @@ _mesa_program_binary(struct gl_context *ctx, struct gl_shader_program *sh_prog, uint8_t driver_sha1[20]; unsigned header_size = get_program_binary_header_size(); - ctx->Driver.GetProgramBinaryDriverSHA1(ctx, driver_sha1); + st_get_program_binary_driver_sha1(ctx, driver_sha1); const void *payload = get_program_binary_payload(binary_format, driver_sha1, binary, length); diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index ac0a22d..518e5d3 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -837,8 +837,6 @@ st_init_driver_functions(struct pipe_screen *screen, st_init_vdpau_functions(functions); /* GL_ARB_get_program_binary */ - functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1; - enum pipe_shader_ir preferred_ir = (enum pipe_shader_ir) screen->get_shader_param(screen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_PREFERRED_IR); -- 2.7.4