mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-22 17:50:12 +01:00
24be011901
Utgard supports MSAA 4x, so wire it up. RSW bits were already REd by Luc, the only remaining part was storing non-resolved buffers, reloading them (including for depth/stencil) and doing MSAA resolve. To store non-resolved buffer we need to set mrt_pitch and mrt_bits registers in WB, and to resolve non-resolved buffer we need to reload it into individual samples and then write out with mrt_bits = 0, it's now done by lima blitter. We also need to do resolve on transfer_map() of multi-sampled buffers, so utilize u_transfer_helper for that. As a side fix, it turns out that our wb_reg definition wasn't correct, 'zero' isn't always zero, it's set if we need to swap channels, and it goes before mrt_bits. mrt_bits actually enables multiple MRTs, so this commit renames 'zero' to 'flags' and changes its position. If mrt_bits == 0 and MSAA is enabled, GPU does resolve in place, to expose this functionality we set PIPE_CAP_SURFACE_SAMPLE_COUNT. Fixes dEQP-GLES2.functional.multisample.* Reviewed-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13963>
101 lines
2.6 KiB
C
101 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2017-2019 Lima Project
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sub license,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifndef H_LIMA_RESOURCE
|
|
#define H_LIMA_RESOURCE
|
|
|
|
#include "pipe/p_state.h"
|
|
|
|
/* max texture size is 4096x4096 */
|
|
#define LIMA_MAX_MIP_LEVELS 13
|
|
#define LAYOUT_CONVERT_THRESHOLD 8
|
|
|
|
struct lima_screen;
|
|
struct panfrost_minmax_cache;
|
|
|
|
struct lima_resource_level {
|
|
uint32_t width;
|
|
uint32_t stride;
|
|
uint32_t offset;
|
|
uint32_t layer_stride;
|
|
};
|
|
|
|
struct lima_damage_region {
|
|
struct pipe_scissor_state *region;
|
|
struct pipe_scissor_state bound;
|
|
unsigned num_region;
|
|
bool aligned;
|
|
};
|
|
|
|
struct lima_resource {
|
|
struct pipe_resource base;
|
|
|
|
struct lima_damage_region damage;
|
|
struct renderonly_scanout *scanout;
|
|
struct lima_bo *bo;
|
|
struct panfrost_minmax_cache *index_cache;
|
|
uint32_t mrt_pitch;
|
|
bool tiled;
|
|
bool modifier_constant;
|
|
unsigned full_updates;
|
|
|
|
struct lima_resource_level levels[LIMA_MAX_MIP_LEVELS];
|
|
};
|
|
|
|
struct lima_surface {
|
|
struct pipe_surface base;
|
|
int tiled_w, tiled_h;
|
|
unsigned reload;
|
|
};
|
|
|
|
struct lima_transfer {
|
|
struct pipe_transfer base;
|
|
void *staging;
|
|
};
|
|
|
|
static inline struct lima_resource *
|
|
lima_resource(struct pipe_resource *res)
|
|
{
|
|
return (struct lima_resource *)res;
|
|
}
|
|
|
|
static inline struct lima_surface *
|
|
lima_surface(struct pipe_surface *surf)
|
|
{
|
|
return (struct lima_surface *)surf;
|
|
}
|
|
|
|
static inline struct lima_transfer *
|
|
lima_transfer(struct pipe_transfer *trans)
|
|
{
|
|
return (struct lima_transfer *)trans;
|
|
}
|
|
|
|
void
|
|
lima_resource_screen_init(struct lima_screen *screen);
|
|
|
|
void
|
|
lima_resource_context_init(struct lima_context *ctx);
|
|
|
|
#endif
|