fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 02:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "zink: add to multisample field to zink_gfx_pipeline_state"

Browse source 
This reverts commit 14d5892609.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22753>
This commit is contained in:
antonino 2023-04-28 11:36:08 +02:00 • committed by Marge Bot
parent 8cbd6acf12
commit e7b03fa3dc
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/zink/zink_state.c
View file

@ -659,7 +659,6 @@ zink_bind_rasterizer_state(struct pipe_context *pctx, void *cso)
bool half_pixel_center = ctx->rast_state ? ctx->rast_state->base.half_pixel_center : true;
float line_width = ctx->rast_state ? ctx->rast_state->base.line_width : 1.0;
ctx->rast_state = cso;
ctx->gfx_pipeline_state.multisample = !ctx->rast_state || ctx->rast_state->base.multisample;
if (ctx->rast_state) {
if (screen->info.have_EXT_provoking_vertex &&

6
src/gallium/drivers/zink/zink_types.h
View file

@ -822,8 +822,7 @@ struct zink_gfx_pipeline_state {
/* order matches zink_gfx_output_key */
unsigned force_persample_interp:1;
uint32_t rast_samples:6;
uint32_t multisample: 1;
uint32_t min_samples:5;
uint32_t min_samples:6;
uint32_t feedback_loop : 1;
uint32_t feedback_loop_zs : 1;
uint32_t rast_attachment_order : 1;
@ -999,8 +998,7 @@ struct zink_gfx_output_key {
struct {
unsigned force_persample_interp:1;
uint32_t rast_samples:6;
uint32_t multisample: 1;
uint32_t min_samples:5;
uint32_t min_samples:6;
uint32_t feedback_loop : 1;
uint32_t feedback_loop_zs : 1;
uint32_t rast_attachment_order : 1;