OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Make entrypoint resolution take a gen_device_info

Browse Source 
In order for things such as the ANV_CALL and the ifuncs to work, we used to
have a singleton gen_device_info structure that got assigned the first time
you create a device.  Given that the driver will never be used
simultaneously on two different generations of hardware, this was fairly
safe to do.  However, it has caused a few hickups and isn't, in general, a
good plan.  Now that the two primary reasons for this singleton are gone,
we can get rid of it and make things quite a bit safer.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand
2016-10-07 15:47:45 -07:00
parent 4c9dec80ed
commit 6d557ae403
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/intel/vulkan/anv_entrypoints_gen.py
View File

@@ -214,22 +214,14 @@ for layer in [ "anv", "gen7", "gen75", "gen8", "gen9" ]:
print "};\n"
print """
static struct gen_device_info dispatch_devinfo;
void
anv_set_dispatch_devinfo(const struct gen_device_info *devinfo)
{
dispatch_devinfo = *devinfo;
}
static void * __attribute__ ((noinline))
anv_resolve_entrypoint(uint32_t index)
anv_resolve_entrypoint(const struct gen_device_info *devinfo, uint32_t index)
{
if (dispatch_devinfo.gen == 0) {
if (devinfo == NULL) {
return anv_layer.entrypoints[index];
}
switch (dispatch_devinfo.gen) {
switch (devinfo->gen) {
case 9:
if (gen9_layer.entrypoints[index])
return gen9_layer.entrypoints[index];
@@ -239,7 +231,7 @@ anv_resolve_entrypoint(uint32_t index)
return gen8_layer.entrypoints[index];
/* fall through */
case 7:
if (dispatch_devinfo.is_haswell && gen75_layer.entrypoints[index])
if (devinfo->is_haswell && gen75_layer.entrypoints[index])
return gen75_layer.entrypoints[index];
if (gen7_layer.entrypoints[index])
@@ -301,7 +293,7 @@ print "};"
print """
void *
anv_lookup_entrypoint(const char *name)
anv_lookup_entrypoint(const struct gen_device_info *devinfo, const char *name)
{
static const uint32_t prime_factor = %d;
static const uint32_t prime_step = %d;
@@ -325,6 +317,6 @@ anv_lookup_entrypoint(const char *name)
if (strcmp(name, strings + e->name) != 0)
return NULL;
return anv_resolve_entrypoint(i);
return anv_resolve_entrypoint(devinfo, i);
}
""" % (prime_factor, prime_step, hash_mask)