KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/blorp: Use flat inputs instead of uniforms 

v2 (Jason): Use LOAD_INPUT() macro

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Topi Pohjolainen 2016-05-15 07:43:39 +03:00
parent 07db95c24d
commit 46e1132b80
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
View File

@ -331,10 +331,10 @@ enum sampler_message_arg
struct brw_blorp_blit_vars { struct brw_blorp_blit_vars {
/* Input values from brw_blorp_wm_inputs */ /* Input values from brw_blorp_wm_inputs */
nir_variable *u_discard_rect; nir_variable *v_discard_rect;
nir_variable *u_rect_grid; nir_variable *v_rect_grid;
nir_variable *u_coord_transform; nir_variable *v_coord_transform;
nir_variable *u_src_z; nir_variable *v_src_z;
/* gl_FragCoord */ /* gl_FragCoord */
nir_variable *frag_coord; nir_variable *frag_coord;
@ -351,9 +351,11 @@ brw_blorp_blit_vars_init(nir_builder *b, struct brw_blorp_blit_vars *v,
assert(!key->use_kill || !(key->blend && key->blit_scaled)); assert(!key->use_kill || !(key->blend && key->blit_scaled));
#define LOAD_INPUT(name, type)\ #define LOAD_INPUT(name, type)\
v->u_##name = nir_variable_create(b->shader, nir_var_uniform, type, #name); \ v->v_##name = nir_variable_create(b->shader, nir_var_shader_in, \
v->u_##name->data.location = \ type, #name); \
offsetof(struct brw_blorp_wm_inputs, name); v->v_##name->data.interpolation = INTERP_QUALIFIER_FLAT; \
v->v_##name->data.location = VARYING_SLOT_VAR0 + \
offsetof(struct brw_blorp_wm_inputs, name) / (4 * sizeof(float));
LOAD_INPUT(discard_rect, glsl_vec4_type()) LOAD_INPUT(discard_rect, glsl_vec4_type())
LOAD_INPUT(rect_grid, glsl_vec4_type()) LOAD_INPUT(rect_grid, glsl_vec4_type())
@ -395,7 +397,7 @@ nir_ssa_def *
blorp_blit_apply_transform(nir_builder *b, nir_ssa_def *src_pos, blorp_blit_apply_transform(nir_builder *b, nir_ssa_def *src_pos,
struct brw_blorp_blit_vars *v) struct brw_blorp_blit_vars *v)
{ {
nir_ssa_def *coord_transform = nir_load_var(b, v->u_coord_transform); nir_ssa_def *coord_transform = nir_load_var(b, v->v_coord_transform);
nir_ssa_def *offset = nir_vec2(b, nir_channel(b, coord_transform, 1), nir_ssa_def *offset = nir_vec2(b, nir_channel(b, coord_transform, 1),
nir_channel(b, coord_transform, 3)); nir_channel(b, coord_transform, 3));
@ -410,7 +412,7 @@ blorp_nir_discard_if_outside_rect(nir_builder *b, nir_ssa_def *pos,
struct brw_blorp_blit_vars *v) struct brw_blorp_blit_vars *v)
{ {
nir_ssa_def *c0, *c1, *c2, *c3; nir_ssa_def *c0, *c1, *c2, *c3;
nir_ssa_def *discard_rect = nir_load_var(b, v->u_discard_rect); 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_x0 = nir_channel(b, discard_rect, 0);
nir_ssa_def *dst_x1 = nir_channel(b, discard_rect, 1); 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_y0 = nir_channel(b, discard_rect, 2);
@ -498,7 +500,7 @@ blorp_nir_txf(nir_builder *b, struct brw_blorp_blit_vars *v,
*/ */
assert(pos->num_components == 2); assert(pos->num_components == 2);
pos = nir_vec3(b, nir_channel(b, pos, 0), nir_channel(b, pos, 1), pos = nir_vec3(b, nir_channel(b, pos, 0), nir_channel(b, pos, 1),
nir_load_var(b, v->u_src_z)); nir_load_var(b, v->v_src_z));
tex->sampler_dim = GLSL_SAMPLER_DIM_3D; tex->sampler_dim = GLSL_SAMPLER_DIM_3D;
tex->coord_components = 3; tex->coord_components = 3;
@ -1031,7 +1033,7 @@ blorp_nir_manual_blend_bilinear(nir_builder *b, nir_ssa_def *pos,
struct brw_blorp_blit_vars *v) struct brw_blorp_blit_vars *v)
{ {
nir_ssa_def *pos_xy = nir_channels(b, pos, 0x3); nir_ssa_def *pos_xy = nir_channels(b, pos, 0x3);
nir_ssa_def *rect_grid = nir_load_var(b, v->u_rect_grid); nir_ssa_def *rect_grid = nir_load_var(b, v->v_rect_grid);
nir_ssa_def *scale = nir_imm_vec2(b, key->x_scale, key->y_scale); nir_ssa_def *scale = nir_imm_vec2(b, key->x_scale, key->y_scale);
/* Translate coordinates to lay out the samples in a rectangular grid /* Translate coordinates to lay out the samples in a rectangular grid

9
src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
View File

@ -67,16 +67,17 @@ brw_blorp_params_get_clear_kernel(struct brw_context *brw,
nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL); nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL);
b.shader->info.name = ralloc_strdup(b.shader, "BLORP-clear"); b.shader->info.name = ralloc_strdup(b.shader, "BLORP-clear");
nir_variable *u_color = nir_variable_create(b.shader, nir_var_uniform, nir_variable *v_color = nir_variable_create(b.shader, nir_var_shader_in,
glsl_vec4_type(), "u_color"); glsl_vec4_type(), "v_color");
u_color->data.location = 0; v_color->data.location = VARYING_SLOT_VAR0;
v_color->data.interpolation = INTERP_QUALIFIER_FLAT;
nir_variable *frag_color = nir_variable_create(b.shader, nir_var_shader_out, nir_variable *frag_color = nir_variable_create(b.shader, nir_var_shader_out,
glsl_vec4_type(), glsl_vec4_type(),
"gl_FragColor"); "gl_FragColor");
frag_color->data.location = FRAG_RESULT_COLOR; frag_color->data.location = FRAG_RESULT_COLOR;
nir_copy_var(&b, frag_color, u_color); nir_copy_var(&b, frag_color, v_color);
struct brw_wm_prog_key wm_key; struct brw_wm_prog_key wm_key;
brw_blorp_init_wm_prog_key(&wm_key); brw_blorp_init_wm_prog_key(&wm_key);