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

intel/compiler: Remove surface_idx from brw_image_param

Browse Source 
Now that the drivers are lowering to surface indices themselves, we no
longer need to push the surface index into the shader.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-08-17 09:15:56 -05:00
parent 3cbc02e469
commit d8033d4083
6 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/intel/compiler/brw_compiler.h
View File

@@ -434,18 +434,14 @@ union brw_any_prog_key {
* entries [most of them except when we're doing untyped surface * entries [most of them except when we're doing untyped surface
* access] will be removed by the uniform packing pass. * access] will be removed by the uniform packing pass.
*/ */
#define BRW_IMAGE_PARAM_SURFACE_IDX_OFFSET 0 #define BRW_IMAGE_PARAM_OFFSET_OFFSET 0
#define BRW_IMAGE_PARAM_OFFSET_OFFSET 4 #define BRW_IMAGE_PARAM_SIZE_OFFSET 4
#define BRW_IMAGE_PARAM_SIZE_OFFSET 8 #define BRW_IMAGE_PARAM_STRIDE_OFFSET 8
#define BRW_IMAGE_PARAM_STRIDE_OFFSET 12 #define BRW_IMAGE_PARAM_TILING_OFFSET 12
#define BRW_IMAGE_PARAM_TILING_OFFSET 16 #define BRW_IMAGE_PARAM_SWIZZLING_OFFSET 16
#define BRW_IMAGE_PARAM_SWIZZLING_OFFSET 20 #define BRW_IMAGE_PARAM_SIZE 20
#define BRW_IMAGE_PARAM_SIZE 24
struct brw_image_param { struct brw_image_param {
/** Surface binding table index. */
uint32_t surface_idx;
/** Offset applied to the X and Y surface coordinates. */ /** Offset applied to the X and Y surface coordinates. */
uint32_t offset[2]; uint32_t offset[2];

3
src/intel/compiler/brw_nir_lower_image_load_store.c
View File

@@ -91,9 +91,6 @@ _load_image_param(nir_builder *b, nir_deref_instr *deref, unsigned offset)
nir_intrinsic_set_base(load, offset / 4); nir_intrinsic_set_base(load, offset / 4);
switch (offset) { switch (offset) {
case BRW_IMAGE_PARAM_SURFACE_IDX_OFFSET:
load->num_components = 1;
break;
case BRW_IMAGE_PARAM_OFFSET_OFFSET: case BRW_IMAGE_PARAM_OFFSET_OFFSET:
case BRW_IMAGE_PARAM_SWIZZLING_OFFSET: case BRW_IMAGE_PARAM_SWIZZLING_OFFSET:
load->num_components = 2; load->num_components = 2;

2
src/intel/vulkan/anv_nir_apply_pipeline_layout.c
View File

@@ -527,8 +527,6 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline,
struct anv_push_constants *null_data = NULL; struct anv_push_constants *null_data = NULL;
const struct brw_image_param *image_param = null_data->images; const struct brw_image_param *image_param = null_data->images;
for (uint32_t i = 0; i < map->image_count; i++) { for (uint32_t i = 0; i < map->image_count; i++) {
setup_vec4_uniform_value(param + BRW_IMAGE_PARAM_SURFACE_IDX_OFFSET,
(uintptr_t)&image_param->surface_idx, 1);
setup_vec4_uniform_value(param + BRW_IMAGE_PARAM_OFFSET_OFFSET, setup_vec4_uniform_value(param + BRW_IMAGE_PARAM_OFFSET_OFFSET,
(uintptr_t)image_param->offset, 2); (uintptr_t)image_param->offset, 2);
setup_vec4_uniform_value(param + BRW_IMAGE_PARAM_SIZE_OFFSET, setup_vec4_uniform_value(param + BRW_IMAGE_PARAM_SIZE_OFFSET,

2
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -2109,7 +2109,6 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
&cmd_buffer->state.push_constants[stage]->images[image++]; &cmd_buffer->state.push_constants[stage]->images[image++];
*image_param = desc->image_view->planes[binding->plane].storage_image_param; *image_param = desc->image_view->planes[binding->plane].storage_image_param;
image_param->surface_idx = bias + s;
break; break;
} }
@@ -2159,7 +2158,6 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
&cmd_buffer->state.push_constants[stage]->images[image++]; &cmd_buffer->state.push_constants[stage]->images[image++];
*image_param = desc->buffer_view->storage_image_param; *image_param = desc->buffer_view->storage_image_param;
image_param->surface_idx = bias + s;
break; break;
default: default:

3
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
View File

@@ -93,9 +93,6 @@ brw_setup_image_uniform_values(gl_shader_stage stage,
/* Upload the brw_image_param structure. The order is expected to match /* Upload the brw_image_param structure. The order is expected to match
* the BRW_IMAGE_PARAM_*_OFFSET defines. * the BRW_IMAGE_PARAM_*_OFFSET defines.
*/ */
setup_vec4_image_param(param + BRW_IMAGE_PARAM_SURFACE_IDX_OFFSET,
image_idx,
offsetof(brw_image_param, surface_idx), 1);
setup_vec4_image_param(param + BRW_IMAGE_PARAM_OFFSET_OFFSET, setup_vec4_image_param(param + BRW_IMAGE_PARAM_OFFSET_OFFSET,
image_idx, image_idx,
offsetof(brw_image_param, offset), 2); offsetof(brw_image_param, offset), 2);

12
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View File

@@ -1474,11 +1474,9 @@ get_image_format(struct brw_context *brw, mesa_format format, GLenum access)
static void static void
update_default_image_param(struct brw_context *brw, update_default_image_param(struct brw_context *brw,
struct gl_image_unit *u, struct gl_image_unit *u,
unsigned surface_idx,
struct brw_image_param *param) struct brw_image_param *param)
{ {
memset(param, 0, sizeof(*param)); memset(param, 0, sizeof(*param));
param->surface_idx = surface_idx;
/* Set the swizzling shifts to all-ones to effectively disable swizzling -- /* Set the swizzling shifts to all-ones to effectively disable swizzling --
* See emit_address_calculation() in brw_fs_surface_builder.cpp for a more * See emit_address_calculation() in brw_fs_surface_builder.cpp for a more
* detailed explanation of these parameters. * detailed explanation of these parameters.
@@ -1490,11 +1488,10 @@ update_default_image_param(struct brw_context *brw,
static void static void
update_buffer_image_param(struct brw_context *brw, update_buffer_image_param(struct brw_context *brw,
struct gl_image_unit *u, struct gl_image_unit *u,
unsigned surface_idx,
struct brw_image_param *param) struct brw_image_param *param)
{ {
const unsigned size = buffer_texture_range_size(brw, u->TexObj); const unsigned size = buffer_texture_range_size(brw, u->TexObj);
update_default_image_param(brw, u, surface_idx, param); update_default_image_param(brw, u, param);
param->size[0] = size / _mesa_get_format_bytes(u->_ActualFormat); param->size[0] = size / _mesa_get_format_bytes(u->_ActualFormat);
param->stride[0] = _mesa_get_format_bytes(u->_ActualFormat); param->stride[0] = _mesa_get_format_bytes(u->_ActualFormat);
@@ -1516,7 +1513,6 @@ static void
update_image_surface(struct brw_context *brw, update_image_surface(struct brw_context *brw,
struct gl_image_unit *u, struct gl_image_unit *u,
GLenum access, GLenum access,
unsigned surface_idx,
uint32_t *surf_offset, uint32_t *surf_offset,
struct brw_image_param *param) struct brw_image_param *param)
{ {
@@ -1538,7 +1534,7 @@ update_image_surface(struct brw_context *brw,
format, buffer_size, texel_size, format, buffer_size, texel_size,
written ? RELOC_WRITE : 0); written ? RELOC_WRITE : 0);
update_buffer_image_param(brw, u, surface_idx, param); update_buffer_image_param(brw, u, param);
} else { } else {
struct intel_texture_object *intel_obj = intel_texture_object(obj); struct intel_texture_object *intel_obj = intel_texture_object(obj);
@@ -1575,12 +1571,11 @@ update_image_surface(struct brw_context *brw,
} }
isl_surf_fill_image_param(&brw->isl_dev, param, &mt->surf, &view); isl_surf_fill_image_param(&brw->isl_dev, param, &mt->surf, &view);
param->surface_idx = surface_idx;
} }
} else { } else {
emit_null_surface_state(brw, NULL, surf_offset); emit_null_surface_state(brw, NULL, surf_offset);
update_default_image_param(brw, u, surface_idx, param); update_default_image_param(brw, u, param);
} }
} }
@@ -1599,7 +1594,6 @@ brw_upload_image_surfaces(struct brw_context *brw,
const unsigned surf_idx = prog_data->binding_table.image_start + i; const unsigned surf_idx = prog_data->binding_table.image_start + i;
update_image_surface(brw, u, prog->sh.ImageAccess[i], update_image_surface(brw, u, prog->sh.ImageAccess[i],
surf_idx,
&stage_state->surf_offset[surf_idx], &stage_state->surf_offset[surf_idx],
&stage_state->image_param[i]); &stage_state->image_param[i]);
} }