RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: allow selection of true 32 bit float if float16 unavailable 

Shouldn't make a difference for OpenGL (even with the weird duplication
of these functions removed). Might be useful for the WIP vulkan backend.
This commit is contained in:
wm4 2017-08-24 22:44:41 +02:00
parent ecef999d19
commit 68dc7d1695
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
video/out/opengl/ra.c
View File

@ -132,35 +132,31 @@ const struct ra_format *ra_find_uint_format(struct ra *ra,
// Find a float format of any precision that matches the C type of the same // Find a float format of any precision that matches the C type of the same
// size for upload. // size for upload.
// May drop bits from the mantissa (such as selecting float16 even if
// bytes_per_component == 32); prefers possibly faster formats first.
static const struct ra_format *ra_find_float_format(struct ra *ra, static const struct ra_format *ra_find_float_format(struct ra *ra,
int bytes_per_component, int bytes_per_component,
int n_components) int n_components)
{ {
// Assumes ra_format are ordered by quality. // Assumes ra_format are ordered by performance.
// The >=16 check is to avoid catching fringe formats.
for (int n = 0; n < ra->num_formats; n++) { for (int n = 0; n < ra->num_formats; n++) {
const struct ra_format *fmt = ra->formats[n]; const struct ra_format *fmt = ra->formats[n];
if (fmt->ctype == RA_CTYPE_FLOAT && fmt->num_components == n_components && if (fmt->ctype == RA_CTYPE_FLOAT && fmt->num_components == n_components &&
fmt->pixel_size == bytes_per_component * n_components && fmt->pixel_size == bytes_per_component * n_components &&
fmt->component_depth[0] >= 16 &&
fmt->linear_filter && ra_format_is_regular(fmt)) fmt->linear_filter && ra_format_is_regular(fmt))
return fmt; return fmt;
} }
return NULL; return NULL;
} }
// Return a filterable regular format that uses float16 internally, but does 32 bit // Return a filterable regular format that uses at least float16 internally, and
// transfer. (This is just so we don't need 32->16 bit conversion on CPU, // uses a normal C float for transfer on the CPU side. (This is just so we don't
// which would be ok but messy.) // need 32->16 bit conversion on CPU, which would be messy.)
const struct ra_format *ra_find_float16_format(struct ra *ra, int n_components) const struct ra_format *ra_find_float16_format(struct ra *ra, int n_components)
{ {
for (int n = 0; n < ra->num_formats; n++) { return ra_find_float_format(ra, sizeof(float), n_components);
const struct ra_format *fmt = ra->formats[n];
if (fmt->ctype == RA_CTYPE_FLOAT && fmt->num_components == n_components &&
fmt->pixel_size == sizeof(float) * n_components &&
fmt->component_depth[0] == 16 &&
fmt->linear_filter && ra_format_is_regular(fmt))
return fmt;
}
return NULL;
} }
const struct ra_format *ra_find_named_format(struct ra *ra, const char *name) const struct ra_format *ra_find_named_format(struct ra *ra, const char *name)