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

Revert "zink: add single_sample to fs key"

Browse Source 
This reverts commit 420f2c0878.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22753>
This commit is contained in:
antonino
2023-04-28 11:36:15 +02:00
committed by Marge Bot
parent e7b03fa3dc
commit b7f815117e
4 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_draw.cpp
-2
View File
@@ -513,8 +513,6 @@ zink_draw(struct pipe_context *pctx,
zink_set_primitive_emulation_keys(ctx);
}
zink_update_fs_key_single_sample(ctx);
if (index_size) {
const VkIndexType index_type[3] = {
VK_INDEX_TYPE_UINT8_EXT,
src/gallium/drivers/zink/zink_program.c
-9
View File
@@ -2454,12 +2454,3 @@ zink_set_primitive_emulation_keys(struct zink_context *ctx)
ctx->gfx_stages[MESA_SHADER_GEOMETRY]->non_fs.is_generated)
ctx->base.bind_gs_state(&ctx->base, NULL);
}
void
zink_update_fs_key_single_sample(struct zink_context *ctx)
{
bool single_sample = ctx->rast_state && !ctx->rast_state->base.multisample &&
ctx->gfx_pipeline_state.rast_samples != 0;
if (zink_get_fs_base_key(ctx)->single_sample != single_sample)
zink_set_fs_base_key(ctx)->single_sample = single_sample;
}
src/gallium/drivers/zink/zink_program.h
-3
View File
@@ -315,9 +315,6 @@ zink_get_tcs_key(const struct zink_context *ctx)
void
zink_update_fs_key_samples(struct zink_context *ctx);
void
zink_update_fs_key_single_sample(struct zink_context *ctx);
void
zink_update_gs_key_rectangular_line(struct zink_context *ctx);
src/gallium/drivers/zink/zink_shader_keys.h
+1 -2
View File
@@ -85,8 +85,7 @@ struct zink_fs_key_base {
bool force_persample_interp : 1;
bool fbfetch_ms : 1;
bool shadow_needs_shader_swizzle : 1; //append zink_zs_swizzle_key after the key data
bool single_sample: 1;
uint8_t pad : 1;
uint8_t pad : 2;
uint8_t coord_replace_bits;
};