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

intel: Fix GEN_GEN macro checks 

Fixes: 9da8a55b08 - intel: Rename GEN_GEN macro to GFX_VER
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10365>
This commit is contained in:
Anuj Phogat 2021-04-20 16:06:13 -07:00 committed by Marge Bot
parent 9967dabe91
commit 8acf361db4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/iris/iris_state.c
View File

@ -3502,7 +3502,7 @@ iris_set_vertex_buffers(struct pipe_context *ctx,
ro_bo(NULL, res->bo->gtt_offset + (int) buffer->buffer_offset); ro_bo(NULL, res->bo->gtt_offset + (int) buffer->buffer_offset);
vb.MOCS = iris_mocs(res->bo, &screen->isl_dev, vb.MOCS = iris_mocs(res->bo, &screen->isl_dev,
ISL_SURF_USAGE_VERTEX_BUFFER_BIT); ISL_SURF_USAGE_VERTEX_BUFFER_BIT);
#if GEN_GEN >= 12 #if GFX_VER >= 12
vb.L3BypassDisable = true; vb.L3BypassDisable = true;
#endif #endif
} else { } else {
@ -3751,7 +3751,7 @@ iris_set_stream_output_targets(struct pipe_context *ctx,
iris_dirty_for_history(ice, res); iris_dirty_for_history(ice, res);
} }
} }
#if GEN_GEN >= 12 #if GFX_VER >= 12
/* SO draws require flushing of const cache to make SO data /* SO draws require flushing of const cache to make SO data
* observable when VB/IB are cached in L3. * observable when VB/IB are cached in L3.
*/ */
@ -6324,7 +6324,7 @@ iris_upload_dirty_render_state(struct iris_context *ice,
(int) ice->draw.draw_params.offset); (int) ice->draw.draw_params.offset);
vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev, vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev,
ISL_SURF_USAGE_VERTEX_BUFFER_BIT); ISL_SURF_USAGE_VERTEX_BUFFER_BIT);
#if GEN_GEN >= 12 #if GFX_VER >= 12
vb.L3BypassDisable = true; vb.L3BypassDisable = true;
#endif #endif
} }
@ -6350,7 +6350,7 @@ iris_upload_dirty_render_state(struct iris_context *ice,
(int) ice->draw.derived_draw_params.offset); (int) ice->draw.derived_draw_params.offset);
vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev, vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev,
ISL_SURF_USAGE_VERTEX_BUFFER_BIT); ISL_SURF_USAGE_VERTEX_BUFFER_BIT);
#if GEN_GEN >= 12 #if GFX_VER >= 12
vb.L3BypassDisable = true; vb.L3BypassDisable = true;
#endif #endif
} }
@ -6637,7 +6637,7 @@ iris_upload_render_state(struct iris_context *ice,
ISL_SURF_USAGE_INDEX_BUFFER_BIT); ISL_SURF_USAGE_INDEX_BUFFER_BIT);
ib.BufferSize = bo->size - offset; ib.BufferSize = bo->size - offset;
ib.BufferStartingAddress = ro_bo(NULL, bo->gtt_offset + offset); ib.BufferStartingAddress = ro_bo(NULL, bo->gtt_offset + offset);
#if GEN_GEN >= 12 #if GFX_VER >= 12
ib.L3BypassDisable = true; ib.L3BypassDisable = true;
#endif #endif
} }