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

panfrost: Add negative lod bias support

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Icecream95 2020-01-09 15:13:58 +13:00 • committed by Tomeu Vizoso
parent daf1d5ad4c
commit f2f1277624
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/panfrost/pan_context.c
View file

@ -1801,9 +1801,9 @@ panfrost_create_sampler_state(
cso->border_color.f[2],
cso->border_color.f[3]
},
.min_lod = FIXED_16(cso->min_lod),
.max_lod = FIXED_16(cso->max_lod),
.lod_bias = FIXED_16(cso->lod_bias),
.min_lod = FIXED_16(cso->min_lod, false), /* clamp at 0 */
.max_lod = FIXED_16(cso->max_lod, false),
.lod_bias = FIXED_16(cso->lod_bias, true), /* can be negative */
.seamless_cube_map = cso->seamless_cube_map,
};

20
src/panfrost/include/panfrost-job.h
View file

@ -29,6 +29,7 @@
#define __PANFROST_JOB_H__
#include <stdint.h>
#include <stdbool.h>
#include <panfrost-misc.h>
enum mali_job_type {
@ -1253,13 +1254,14 @@ struct mali_texture_descriptor {
#define DECODE_FIXED_16(x) ((float) (x / 256.0))
static inline uint16_t
FIXED_16(float x)
static inline int16_t
FIXED_16(float x, bool allow_negative)
{
/* Clamp inputs, accounting for float error */
float max_lod = (32.0 - (1.0 / 512.0));
float min_lod = allow_negative ? -max_lod : 0.0;
x = ((x > max_lod) ? max_lod : ((x < 0.0) ? 0.0 : x));
x = ((x > max_lod) ? max_lod : ((x < min_lod) ? min_lod : x));
return (int) (x * 256.0);
}
@ -1267,13 +1269,13 @@ FIXED_16(float x)
struct mali_sampler_descriptor {
uint16_t filter_mode;
/* Fixed point. Upper 8-bits is before the decimal point, although it
* caps [0-31]. Lower 8-bits is after the decimal point: int(round(x *
* 256)) */
/* Fixed point, signed.
* Upper 7 bits before the decimal point, although it caps [0-31].
* Lower 8 bits after the decimal point: int(round(x * 256)) */
uint16_t lod_bias;
uint16_t min_lod;
uint16_t max_lod;
int16_t lod_bias;
int16_t min_lod;
int16_t max_lod;
/* All one word in reality, but packed a bit. Comparisons are flipped
* from OpenGL. */