fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 13:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: Handle vertex shader with window space position

Browse source 
Iris advertises support for PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION
so let's actually implement it.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110657

Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Danylo Piliaiev 2019-07-25 13:09:08 +03:00 • committed by Kenneth Graunke
parent b783f9f77e
commit b4c54894bb
3 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_context.h
View file

@ -631,6 +631,8 @@ struct iris_context {
bool prim_is_points_or_lines; bool prim_is_points_or_lines;
uint8_t vertices_per_patch; uint8_t vertices_per_patch;
bool window_space_position;
/** The last compute grid size */ /** The last compute grid size */
uint32_t last_grid[3]; uint32_t last_grid[3];
/** Reference to the BO containing the compute grid size */ /** Reference to the BO containing the compute grid size */

14
src/gallium/drivers/iris/iris_program.c
View file

@ -2232,6 +2232,20 @@ bind_shader_state(struct iris_context *ice,
static void static void
iris_bind_vs_state(struct pipe_context *ctx, void *state) iris_bind_vs_state(struct pipe_context *ctx, void *state)
{ {
struct iris_context *ice = (struct iris_context *)ctx;
struct iris_uncompiled_shader *new_ish = state;
if (new_ish &&
ice->state.window_space_position !=
new_ish->nir->info.vs.window_space_position) {
ice->state.window_space_position =
new_ish->nir->info.vs.window_space_position;
ice->state.dirty |= IRIS_DIRTY_CLIP |
IRIS_DIRTY_RASTER |
IRIS_DIRTY_CC_VIEWPORT;
}
bind_shader_state((void *) ctx, state, MESA_SHADER_VERTEX); bind_shader_state((void *) ctx, state, MESA_SHADER_VERTEX);
} }

33
src/gallium/drivers/iris/iris_state.c
View file

@ -1204,7 +1204,6 @@ iris_create_rasterizer_state(struct pipe_context *ctx,
iris_pack_command(GENX(3DSTATE_SF), cso->sf, sf) { iris_pack_command(GENX(3DSTATE_SF), cso->sf, sf) {
sf.StatisticsEnable = true; sf.StatisticsEnable = true;
sf.ViewportTransformEnable = true;
sf.AALineDistanceMode = AALINEDISTANCE_TRUE; sf.AALineDistanceMode = AALINEDISTANCE_TRUE;
sf.LineEndCapAntialiasingRegionWidth = sf.LineEndCapAntialiasingRegionWidth =
state->line_smooth ? _10pixels : _05pixels; state->line_smooth ? _10pixels : _05pixels;
@ -4335,6 +4334,18 @@ iris_update_surface_base_address(struct iris_batch *batch,
batch->last_surface_base_address = binder->bo->gtt_offset; batch->last_surface_base_address = binder->bo->gtt_offset;
} }
static inline void
iris_viewport_zmin_zmax(const struct pipe_viewport_state *vp, bool halfz,
bool window_space_position, float *zmin, float *zmax)
{
if (window_space_position) {
*zmin = 0.f;
*zmax = 1.f;
return;
}
util_viewport_zmin_zmax(vp, halfz, zmin, zmax);
}
static void static void
iris_upload_dirty_render_state(struct iris_context *ice, iris_upload_dirty_render_state(struct iris_context *ice,
struct iris_batch *batch, struct iris_batch *batch,
@ -4362,7 +4373,8 @@ iris_upload_dirty_render_state(struct iris_context *ice,
GENX(CC_VIEWPORT_length), 32, &cc_vp_address); GENX(CC_VIEWPORT_length), 32, &cc_vp_address);
for (int i = 0; i < ice->state.num_viewports; i++) { for (int i = 0; i < ice->state.num_viewports; i++) {
float zmin, zmax; float zmin, zmax;
util_viewport_zmin_zmax(&ice->state.viewports[i], iris_viewport_zmin_zmax(&ice->state.viewports[i],
ice->state.window_space_position,
cso_rast->clip_halfz, &zmin, &zmax); cso_rast->clip_halfz, &zmin, &zmax);
if (cso_rast->depth_clip_near) if (cso_rast->depth_clip_near)
zmin = 0.0; zmin = 0.0;
@ -4773,8 +4785,14 @@ iris_upload_dirty_render_state(struct iris_context *ice,
uint32_t dynamic_clip[GENX(3DSTATE_CLIP_length)]; uint32_t dynamic_clip[GENX(3DSTATE_CLIP_length)];
iris_pack_command(GENX(3DSTATE_CLIP), &dynamic_clip, cl) { iris_pack_command(GENX(3DSTATE_CLIP), &dynamic_clip, cl) {
cl.StatisticsEnable = ice->state.statistics_counters_enabled; cl.StatisticsEnable = ice->state.statistics_counters_enabled;
cl.ClipMode = cso_rast->rasterizer_discard ? CLIPMODE_REJECT_ALL if (cso_rast->rasterizer_discard)
: CLIPMODE_NORMAL; cl.ClipMode = CLIPMODE_REJECT_ALL;
else if (ice->state.window_space_position)
cl.ClipMode = CLIPMODE_ACCEPT_ALL;
else
cl.ClipMode = CLIPMODE_NORMAL;
cl.PerspectiveDivideDisable = ice->state.window_space_position;
cl.ViewportXYClipTestEnable = !points_or_lines; cl.ViewportXYClipTestEnable = !points_or_lines;
if (wm_prog_data->barycentric_interp_modes & if (wm_prog_data->barycentric_interp_modes &
@ -4791,8 +4809,13 @@ iris_upload_dirty_render_state(struct iris_context *ice,
if (dirty & IRIS_DIRTY_RASTER) { if (dirty & IRIS_DIRTY_RASTER) {
struct iris_rasterizer_state *cso = ice->state.cso_rast; struct iris_rasterizer_state *cso = ice->state.cso_rast;
iris_batch_emit(batch, cso->raster, sizeof(cso->raster)); iris_batch_emit(batch, cso->raster, sizeof(cso->raster));
iris_batch_emit(batch, cso->sf, sizeof(cso->sf));
uint32_t dynamic_sf[GENX(3DSTATE_SF_length)];
iris_pack_command(GENX(3DSTATE_SF), &dynamic_sf, sf) {
sf.ViewportTransformEnable = !ice->state.window_space_position;
}
iris_emit_merge(batch, cso->sf, dynamic_sf,
ARRAY_SIZE(dynamic_sf));
} }
if (dirty & IRIS_DIRTY_WM) { if (dirty & IRIS_DIRTY_WM) {