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

i965/blorp: Enable blits on gen8

Browse source 
v2 (Ken): Moved switch cases for gen8/9 in texel_fetch() to
          earlier patch adding gen8/9 sampling support.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Topi Pohjolainen 2016-03-30 20:41:30 +03:00
parent f7ab4e0cc4
commit 7de72f728b
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_blorp.cpp
View file

@ -210,7 +210,7 @@ void
brw_blorp_exec(struct brw_context *brw, const brw_blorp_params *params)
{
struct gl_context *ctx = &brw->ctx;
uint32_t estimated_max_batch_usage = 1500;
const uint32_t estimated_max_batch_usage = brw->gen >= 8 ? 1800 : 1500;
bool check_aperture_failed_once = false;
/* Flush the sampler and render caches. We definitely need to flush the
@ -236,6 +236,10 @@ retry:
case 7:
gen7_blorp_exec(brw, params);
break;
case 8:
case 9:
gen8_blorp_exec(brw, params);
break;
default:
/* BLORP is not supported before Gen6. */
unreachable("not reached");

6
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
View file

@ -256,8 +256,8 @@ brw_blorp_copytexsubimage(struct brw_context *brw,
src_mt->num_samples > 8 || dst_mt->num_samples > 8)
return false;
/* BLORP is only supported for Gen6-7. */
if (brw->gen < 6 || brw->gen > 7)
/* BLORP is only supported from Gen6 onwards. */
if (brw->gen < 6)
return false;
if (_mesa_get_format_base_format(src_rb->Format) !=
@ -359,7 +359,7 @@ brw_blorp_framebuffer(struct brw_context *brw,
GLbitfield mask, GLenum filter)
{
/* BLORP is not supported before Gen6. */
if (brw->gen < 6 || brw->gen >= 8)
if (brw->gen < 6)
return mask;
/* There is support only for four and eight samples. */

3
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -2165,8 +2165,7 @@ intel_miptree_updownsample(struct brw_context *brw,
struct intel_mipmap_tree *dst)
{
/* There is support only for four and eight samples. */
const bool use_blorp = brw->gen < 8 &&
src->num_samples != 2 && dst->num_samples != 2 &&
const bool use_blorp = src->num_samples != 2 && dst->num_samples != 2 &&
src->num_samples <= 8 && dst->num_samples <= 8;
if (use_blorp) {