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

intel/blorp: Change discard terminology to bounds

Browse Source 
Suggested-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11564>
This commit is contained in:
Jordan Justen
2021-09-16 12:52:23 -07:00
committed by Marge Bot
parent 9e9481699d
commit 1448e019d6
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/intel/blorp/blorp_blit.c
View File

@@ -37,7 +37,7 @@ static const bool split_blorp_blit_debug = false;
struct brw_blorp_blit_vars {
/* Input values from brw_blorp_wm_inputs */
nir_variable *v_discard_rect;
nir_variable *v_bounds_rect;
nir_variable *v_rect_grid;
nir_variable *v_coord_transform;
nir_variable *v_src_z;
@@ -53,7 +53,7 @@ brw_blorp_blit_vars_init(nir_builder *b, struct brw_blorp_blit_vars *v,
#define LOAD_INPUT(name, type)\
v->v_##name = BLORP_CREATE_NIR_INPUT(b->shader, name, type);
LOAD_INPUT(discard_rect, glsl_vec4_type())
LOAD_INPUT(bounds_rect, glsl_vec4_type())
LOAD_INPUT(rect_grid, glsl_vec4_type())
LOAD_INPUT(coord_transform, glsl_vec4_type())
LOAD_INPUT(src_z, glsl_float_type())
@@ -113,11 +113,11 @@ blorp_nir_discard_if_outside_rect(nir_builder *b, nir_ssa_def *pos,
struct brw_blorp_blit_vars *v)
{
nir_ssa_def *c0, *c1, *c2, *c3;
nir_ssa_def *discard_rect = nir_load_var(b, v->v_discard_rect);
nir_ssa_def *dst_x0 = nir_channel(b, discard_rect, 0);
nir_ssa_def *dst_x1 = nir_channel(b, discard_rect, 1);
nir_ssa_def *dst_y0 = nir_channel(b, discard_rect, 2);
nir_ssa_def *dst_y1 = nir_channel(b, discard_rect, 3);
nir_ssa_def *bounds_rect = nir_load_var(b, v->v_bounds_rect);
nir_ssa_def *dst_x0 = nir_channel(b, bounds_rect, 0);
nir_ssa_def *dst_x1 = nir_channel(b, bounds_rect, 1);
nir_ssa_def *dst_y0 = nir_channel(b, bounds_rect, 2);
nir_ssa_def *dst_y1 = nir_channel(b, bounds_rect, 3);
c0 = nir_ult(b, nir_channel(b, pos, 0), dst_x0);
c1 = nir_uge(b, nir_channel(b, pos, 0), dst_x1);
@@ -1866,10 +1866,10 @@ try_blorp_blit(struct blorp_batch *batch,
/* Round floating point values to nearest integer to avoid "off by one texel"
* kind of errors when blitting.
*/
params->x0 = params->wm_inputs.discard_rect.x0 = round(coords->x.dst0);
params->y0 = params->wm_inputs.discard_rect.y0 = round(coords->y.dst0);
params->x1 = params->wm_inputs.discard_rect.x1 = round(coords->x.dst1);
params->y1 = params->wm_inputs.discard_rect.y1 = round(coords->y.dst1);
params->x0 = params->wm_inputs.bounds_rect.x0 = round(coords->x.dst0);
params->y0 = params->wm_inputs.bounds_rect.y0 = round(coords->y.dst0);
params->x1 = params->wm_inputs.bounds_rect.x1 = round(coords->x.dst1);
params->y1 = params->wm_inputs.bounds_rect.y1 = round(coords->y.dst1);
brw_blorp_setup_coord_transform(&params->wm_inputs.coord_transform[0],
coords->x.src0, coords->x.src1,

10
src/intel/blorp/blorp_priv.h
View File

@@ -99,16 +99,16 @@ struct brw_blorp_coord_transform
};
/**
* Bounding rectangle telling pixel discard which pixels are not to be
* touched. This is needed in when surfaces are configured as something else
* what they really are:
* Bounding rectangle telling pixel discard which pixels are to be touched.
* This is needed in when surfaces are configured as something else what they
* really are:
*
* - writing W-tiled stencil as Y-tiled
* - writing interleaved multisampled as single sampled.
*
* See blorp_nir_discard_if_outside_rect().
*/
struct brw_blorp_discard_rect
struct brw_blorp_bounds_rect
{
uint32_t x0;
uint32_t x1;
@@ -136,7 +136,7 @@ struct brw_blorp_wm_inputs
{
uint32_t clear_color[4];
struct brw_blorp_discard_rect discard_rect;
struct brw_blorp_bounds_rect bounds_rect;
struct brw_blorp_rect_grid rect_grid;
struct brw_blorp_coord_transform coord_transform[2];