From: Kristian Høgsberg Kristensen <kristian.h.kristen...@intel.com>
--- src/mesa/drivers/dri/i965/brw_compiler.h | 7 +++++++ src/mesa/drivers/dri/i965/brw_nir.c | 4 ++++ src/mesa/drivers/dri/i965/brw_wm.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h b/src/mesa/drivers/dri/i965/brw_compiler.h index 7d75202..e28711e 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.h +++ b/src/mesa/drivers/dri/i965/brw_compiler.h @@ -159,6 +159,13 @@ struct brw_sampler_prog_key_data { * For Sandybridge, which shader w/a we need for gather quirks. */ enum gen6_gather_sampler_wa gen6_gather_wa[MAX_SAMPLERS]; + + /** + * Texture units that have a YUV image bound. + */ + uint32_t y_u_v_image_mask; + uint32_t y_uv_image_mask; + uint32_t yx_xuxv_image_mask; }; diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index f9bcba2..c5d5ea9 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -615,6 +615,10 @@ brw_nir_apply_sampler_key(nir_shader *nir, tex_options.swizzles[s][c] = GET_SWZ(key_tex->swizzles[s], c); } + tex_options.lower_y_uv_external = key_tex->y_uv_image_mask; + tex_options.lower_y_u_v_external = key_tex->y_u_v_image_mask; + tex_options.lower_yx_xuxv_external = key_tex->yx_xuxv_image_mask; + if (nir_lower_tex(nir, &tex_options)) { nir_validate_shader(nir); nir = nir_optimize(nir, is_scalar); diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index dbc626c..09aecc6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -35,6 +35,7 @@ #include "program/prog_parameter.h" #include "program/program.h" #include "intel_mipmap_tree.h" +#include "intel_image.h" #include "brw_nir.h" #include "brw_program.h" @@ -206,6 +207,16 @@ brw_debug_recompile_sampler_key(struct brw_context *brw, old_key->msaa_16, key->msaa_16); + found |= key_debug(brw, "y_uv image bound", + old_key->y_uv_image_mask, + key->y_uv_image_mask); + found |= key_debug(brw, "y_u_v image bound", + old_key->y_u_v_image_mask, + key->y_u_v_image_mask); + found |= key_debug(brw, "yx_xuxv image bound", + old_key->yx_xuxv_image_mask, + key->yx_xuxv_image_mask); + for (unsigned int i = 0; i < MAX_SAMPLERS; i++) { found |= key_debug(brw, "textureGather workarounds", old_key->gen6_gather_wa[i], key->gen6_gather_wa[i]); @@ -370,6 +381,24 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx, key->msaa_16 |= 1 << s; } } + + if (t->Target == GL_TEXTURE_EXTERNAL_OES && intel_tex->dri_image) { + __DRIimage *image = intel_tex->dri_image; + switch (image->planar_format->components) { + case __DRI_IMAGE_COMPONENTS_Y_UV: + key->y_uv_image_mask |= 1 << s; + break; + case __DRI_IMAGE_COMPONENTS_Y_U_V: + key->y_u_v_image_mask |= 1 << s; + break; + case __DRI_IMAGE_COMPONENTS_Y_XUXV: + key->yx_xuxv_image_mask |= 1 << s; + break; + default: + break; + } + } + } } } -- 2.5.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev