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

asahi: Scaffold format table

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11086>
This commit is contained in:
Alyssa Rosenzweig 2021-05-31 15:29:20 -04:00 • committed by Marge Bot
parent 6bb7172622
commit 8b1e273cb5
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/asahi/lib/agx_formats.c
View file

@ -21,8 +21,22 @@
* SOFTWARE.
*/
#include "agx_pack.h"
#include "agx_formats.h"
#define T true
#define F false
#define AGX_FMT(pipe, channels, type, is_renderable) \
[PIPE_FORMAT_ ## pipe] = { \
.hw = (AGX_CHANNELS_ ## channels) | ((AGX_TEXTURE_TYPE_ ## type) << 7), \
.renderable = is_renderable \
}
const struct agx_pixel_format_entry agx_pixel_format[PIPE_FORMAT_COUNT] = {
AGX_FMT(B8G8R8A8_UNORM, R8G8B8A8, UNORM, T),
};
const enum agx_format
agx_vertex_format[PIPE_FORMAT_COUNT] = {
[PIPE_FORMAT_R32_FLOAT] = AGX_FORMAT_I32,

9
src/asahi/lib/agx_formats.h
View file

@ -28,6 +28,15 @@
#include "util/format/u_format.h"
#include "asahi/compiler/agx_compile.h"
/* N.b. hardware=0 corresponds to R8 UNORM, which is renderable. So a zero
* entry indicates an invalid format. */
struct agx_pixel_format_entry {
uint16_t hw;
bool renderable : 1;
};
extern const struct agx_pixel_format_entry agx_pixel_format[PIPE_FORMAT_COUNT];
extern const enum agx_format agx_vertex_format[PIPE_FORMAT_COUNT];
#endif

9
src/gallium/drivers/asahi/agx_state.c
View file

@ -268,9 +268,6 @@ agx_bind_sampler_states(struct pipe_context *pctx,
sizeof(struct agx_bo *) * count);
}
#define AGX_TEXTURE_FORMAT(channels, type) \
((AGX_CHANNELS_ ## channels) | ((AGX_TEXTURE_TYPE_ ## type) << 7))
/* Channels agree for RGBA but are weird for force 0/1 */
static enum agx_channel
@ -336,9 +333,8 @@ agx_create_sampler_view(struct pipe_context *pctx,
/* Pack the descriptor into GPU memory */
agx_pack(so->desc->ptr.cpu, TEXTURE, cfg) {
assert(state->format == PIPE_FORMAT_B8G8R8A8_UNORM); // TODO: format table
cfg.layout = agx_translate_layout(rsrc->modifier);
cfg.format = AGX_TEXTURE_FORMAT(R8G8B8A8, UNORM);
cfg.format = agx_pixel_format[state->format].hw;
cfg.swizzle_r = agx_channel_from_pipe(out_swizzle[0]);
cfg.swizzle_g = agx_channel_from_pipe(out_swizzle[1]);
cfg.swizzle_b = agx_channel_from_pipe(out_swizzle[2]);
@ -578,9 +574,8 @@ agx_set_framebuffer_state(struct pipe_context *pctx,
struct agx_resource *tex = agx_resource(surf->texture);
agx_pack(ctx->render_target[i], RENDER_TARGET, cfg) {
assert(surf->format == PIPE_FORMAT_B8G8R8A8_UNORM); // TODO: format table
cfg.layout = agx_translate_layout(tex->modifier);
cfg.format = AGX_TEXTURE_FORMAT(R8G8B8A8, UNORM);
cfg.format = agx_pixel_format[surf->format].hw;
cfg.swizzle_r = AGX_CHANNEL_B;
cfg.swizzle_g = AGX_CHANNEL_G;
cfg.swizzle_b = AGX_CHANNEL_R;