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

asahi: Don't redefine MIN2/MAX2

Browse source 
The tiling function was written before the Mesa driver...

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14903>
This commit is contained in:
Alyssa Rosenzweig 2022-01-16 20:02:59 -05:00 • committed by Marge Bot
parent 570004175f
commit 65368d2f9a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/asahi/lib/tiling.c
View file

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <stdint.h>
#include "util/macros.h"
#include "tiling.h"
/* Z-order with 64x64 tiles:
@ -61,9 +62,6 @@
/* mask of bits used for X coordinate in a tile */
#define SPACE_MASK 0x555 // 0b010101010101
#define MAX2(x, y) (((x) > (y)) ? (x) : (y))
#define MIN2(x, y) (((x) < (y)) ? (x) : (y))
static uint32_t
agx_space_bits(unsigned x)
{