fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/wm: Make compute_barycentric_interp_modes take a nir_shader and a devinfo

Browse source 
Now that everything comes in through NIR, we can pick this directly out of
the shader source and don't need to reference the gl_fragment_program.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2015-10-02 18:31:17 -07:00
parent 1e3c1b107e
commit 443d3bf340
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -44,33 +44,23 @@
* (see enum brw_wm_barycentric_interp_mode) is needed by the fragment shader.
*/
static unsigned
brw_compute_barycentric_interp_modes(struct brw_context *brw,
brw_compute_barycentric_interp_modes(const struct brw_device_info *devinfo,
bool shade_model_flat,
bool persample_shading,
const struct gl_fragment_program *fprog)
nir_shader *shader)
{
unsigned barycentric_interp_modes = 0;
int attr;
/* Loop through all fragment shader inputs to figure out what interpolation
* modes are in use, and set the appropriate bits in
* barycentric_interp_modes.
*/
for (attr = 0; attr < VARYING_SLOT_MAX; ++attr) {
enum glsl_interp_qualifier interp_qualifier =
fprog->InterpQualifier[attr];
bool is_centroid = (fprog->IsCentroid & BITFIELD64_BIT(attr)) &&
!persample_shading;
bool is_sample = (fprog->IsSample & BITFIELD64_BIT(attr)) ||
persample_shading;
bool is_gl_Color = attr == VARYING_SLOT_COL0 || attr == VARYING_SLOT_COL1;
/* Ignore unused inputs. */
if (!(fprog->Base.InputsRead & BITFIELD64_BIT(attr)))
continue;
nir_foreach_variable(var, &shader->inputs) {
enum glsl_interp_qualifier interp_qualifier = var->data.interpolation;
bool is_centroid = var->data.centroid && !persample_shading;
bool is_sample = var->data.sample || persample_shading;
bool is_gl_Color = (var->data.location == VARYING_SLOT_COL0) ||
(var->data.location == VARYING_SLOT_COL1);
/* Ignore WPOS and FACE, because they don't require interpolation. */
if (attr == VARYING_SLOT_POS || attr == VARYING_SLOT_FACE)
if (var->data.location == VARYING_SLOT_POS ||
var->data.location == VARYING_SLOT_FACE)
continue;
/* Determine the set (or sets) of barycentric coordinates needed to
@ -88,7 +78,7 @@ brw_compute_barycentric_interp_modes(struct brw_context *brw,
1 << BRW_WM_NONPERSPECTIVE_SAMPLE_BARYCENTRIC;
}
if ((!is_centroid && !is_sample) ||
brw->needs_unlit_centroid_workaround) {
devinfo->needs_unlit_centroid_workaround) {
barycentric_interp_modes |=
1 << BRW_WM_NONPERSPECTIVE_PIXEL_BARYCENTRIC;
}
@ -103,7 +93,7 @@ brw_compute_barycentric_interp_modes(struct brw_context *brw,
1 << BRW_WM_PERSPECTIVE_SAMPLE_BARYCENTRIC;
}
if ((!is_centroid && !is_sample) ||
brw->needs_unlit_centroid_workaround) {
devinfo->needs_unlit_centroid_workaround) {
barycentric_interp_modes |=
1 << BRW_WM_PERSPECTIVE_PIXEL_BARYCENTRIC;
}
@ -220,9 +210,10 @@ brw_codegen_wm_prog(struct brw_context *brw,
}
prog_data.barycentric_interp_modes =
brw_compute_barycentric_interp_modes(brw, key->flat_shade,
brw_compute_barycentric_interp_modes(brw->intelScreen->devinfo,
key->flat_shade,
key->persample_shading,
&fp->program);
fp->program.Base.nir);
if (unlikely(brw->perf_debug)) {
start_busy = (brw->batch.last_bo &&