fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: use st_compressed_format_fallback more

Browse source 
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Tested-By: Gert Wollny<gert.wollny@collabora.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-By: Gert Wollny <gw.fossdev@gmail.com>
This commit is contained in:
Marek Olšák 2018-02-13 04:19:05 +01:00
parent 912e0525be
commit 3d7e4311bf
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/state_tracker/st_format.c
View file

@ -52,6 +52,7 @@
#include "st_cb_texture.h"
#include "st_context.h"
#include "st_format.h"
#include "st_texture.h"
/**
@ -1046,10 +1047,7 @@ test_format_conversion(struct st_context *st)
for (i = 1; i < MESA_FORMAT_COUNT; i++) {
enum pipe_format pf;
/* ETC formats are translated differently, skip them. */
if (_mesa_is_format_etc2(i))
continue;
if (i == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1)
if (st_compressed_format_fallback(st, i))
continue;
pf = st_mesa_format_to_pipe_format(st, i);
@ -1061,12 +1059,8 @@ test_format_conversion(struct st_context *st)
/* Test all Gallium formats */
for (i = 1; i < PIPE_FORMAT_COUNT; i++) {
/* ETC formats are translated differently, skip them. */
if (i == PIPE_FORMAT_ETC1_RGB8 && !st->has_etc1)
continue;
mesa_format mf = st_pipe_format_to_mesa_format(i);
if (_mesa_is_format_etc2(mf) && !st->has_etc2)
if (st_compressed_format_fallback(st, mf))
continue;
if (mf != MESA_FORMAT_NONE) {
@ -2347,10 +2341,8 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target,
}
if (pFormat == PIPE_FORMAT_NONE) {
/* lie about using etc1/etc2 natively if we do decoding tricks */
mFormat = _mesa_glenum_to_compressed_format(internalFormat);
if ((mFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) ||
(_mesa_is_format_etc2(mFormat) && !st->has_etc2))
if (st_compressed_format_fallback(st, mFormat))
return mFormat;
/* no luck at all */