fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Use the correct NIR options for OpenCL on Bifrost

Browse source 
This is needed so that 64-bit operations are lowered properly.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8358>
This commit is contained in:
Icecream95 2020-12-27 00:01:44 +13:00 • committed by Marge Bot
parent c82ab9b94a
commit 7c2308769b
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/panfrost/pan_compute.c
View file

@ -32,6 +32,8 @@
#include "pan_bo.h"
#include "util/u_memory.h"
#include "nir_serialize.h"
#include "midgard/midgard_compile.h"
#include "bifrost/bifrost_compile.h"
/* Compute CSOs are tracked like graphics shader CSOs, but are
* considerably simpler. We do not implement multiple
@ -44,6 +46,7 @@ panfrost_create_compute_state(
const struct pipe_compute_state *cso)
{
struct panfrost_context *ctx = pan_context(pctx);
struct panfrost_device *dev = pan_device(pctx->screen);
struct panfrost_shader_variants *so = CALLOC_STRUCT(panfrost_shader_variants);
so->cbase = *cso;
@ -60,7 +63,12 @@ panfrost_create_compute_state(
const struct pipe_binary_program_header *hdr = cso->prog;
blob_reader_init(&reader, hdr->blob, hdr->num_bytes);
so->cbase.prog = nir_deserialize(NULL, &midgard_nir_options, &reader);
const struct nir_shader_compiler_options *options =
(dev->quirks & IS_BIFROST) ? &bifrost_nir_options
: &midgard_nir_options;
so->cbase.prog = nir_deserialize(NULL, options, &reader);
so->cbase.ir_type = PIPE_SHADER_IR_NIR;
}