summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-02-17 10:16:16 +1100
committerTimothy Arceri <tarceri@itsqueeze.com>2017-02-17 11:18:43 +1100
commit6602d0401c23211af122f4ef5a86acf5dd9665e7 (patch)
treecc98dc21d0d7438c2be32cdb49667bee81fbe81a /src/gallium
parented6153012167fc7176a23f23ee4cccce9cbaee4a (diff)
st/mesa/glsl: build string of dri options and use as input to building sha for shaders
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/include/state_tracker/st_api.h1
-rw-r--r--src/gallium/state_trackers/dri/dri_screen.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h
index 1b9ef290b1f..daa1f23812e 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/state_tracker/st_api.h
@@ -247,6 +247,7 @@ struct st_config_options
boolean allow_glsl_extension_directive_midshader;
boolean allow_higher_compat_version;
boolean glsl_zero_init;
+ unsigned char config_options_sha1[20];
};
/**
diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 1e278c3d1c2..c2da7e30b24 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -103,6 +103,8 @@ dri_fill_st_options(struct st_config_options *options,
options->allow_higher_compat_version =
driQueryOptionb(optionCache, "allow_higher_compat_version");
options->glsl_zero_init = driQueryOptionb(optionCache, "glsl_zero_init");
+
+ driComputeOptionsSha1(optionCache, options->config_options_sha1);
}
static const __DRIconfig **