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

util: Move texcompress template files into util/format

Browse source 
Because these files are accessed in  util/format/u_format_*.c
To make sure util are self contained we need move these files

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19547>
This commit is contained in:
Yonggang Luo 2022-11-05 17:18:46 +08:00 • committed by Marge Bot
parent 0c12a39682
commit beea3548ce
11 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/main/tests/disable_windows_include.c
View file

@ -113,13 +113,11 @@
#include <mesa/main/texcompress.h>
#include <mesa/main/texcompress_astc.h>
#include <mesa/main/texcompress_bptc.h>
#include <mesa/main/texcompress_bptc_tmp.h>
#include <mesa/main/texcompress_cpal.h>
#include <mesa/main/texcompress_etc.h>
#include <mesa/main/texcompress_fxt1.h>
#include <mesa/main/texcompress_rgtc.h>
#include <mesa/main/texcompress_s3tc.h>
#include <mesa/main/texcompress_s3tc_tmp.h>
#include <mesa/main/texenvprogram.h>
#include <mesa/main/texgetimage.h>
#include <mesa/main/teximage.h>

2
src/mesa/main/texcompress_bptc.c
View file

@ -29,7 +29,7 @@
#include <stdbool.h>
#include "texcompress.h"
#include "texcompress_bptc.h"
#include "texcompress_bptc_tmp.h"
#include "util/format/texcompress_bptc_tmp.h"
#include "texstore.h"
#include "image.h"
#include "mtypes.h"

2
src/mesa/main/texcompress_etc.c
View file

@ -101,7 +101,7 @@ static const int etc2_modifier_tables_non_opaque[8][4] = {
/* define etc1_parse_block and etc. */
#define UINT8_TYPE GLubyte
#define TAG(x) x
#include "texcompress_etc_tmp.h"
#include "util/format/texcompress_etc_tmp.h"
#undef TAG
#undef UINT8_TYPE

2
src/mesa/main/texcompress_s3tc.c
View file

@ -36,7 +36,7 @@
#include "mtypes.h"
#include "texcompress.h"
#include "texcompress_s3tc.h"
#include "texcompress_s3tc_tmp.h"
#include "util/format/texcompress_s3tc_tmp.h"
#include "texstore.h"
#include "format_unpack.h"
#include "util/format_srgb.h"

1
src/mesa/meson.build
View file

@ -213,7 +213,6 @@ files_libmesa = files(
'main/texcompress_cpal.h',
'main/texcompress_etc.c',
'main/texcompress_etc.h',
'main/texcompress_etc_tmp.h',
'main/texcompress_fxt1.c',
'main/texcompress_fxt1.h',
'main/texcompress_rgtc.c',

0
src/mesa/main/texcompress_bptc_tmp.h → src/util/format/texcompress_bptc_tmp.h
View file

0
src/mesa/main/texcompress_etc_tmp.h → src/util/format/texcompress_etc_tmp.h
View file

0
src/mesa/main/texcompress_s3tc_tmp.h → src/util/format/texcompress_s3tc_tmp.h
View file

2
src/util/format/u_format_bptc.c
View file

@ -29,7 +29,7 @@
#include "util/format_srgb.h"
#include "util/u_math.h"
#include "../../mesa/main/texcompress_bptc_tmp.h"
#include "util/format/texcompress_bptc_tmp.h"
void
util_format_bptc_rgba_unorm_unpack_rgba_8unorm(uint8_t *restrict dst_row, unsigned dst_stride,

2
src/util/format/u_format_etc.c
View file

@ -6,7 +6,7 @@
/* define etc1_parse_block and etc. */
#define UINT8_TYPE uint8_t
#define TAG(x) x
#include "../../mesa/main/texcompress_etc_tmp.h"
#include "util/format/texcompress_etc_tmp.h"
#undef TAG
#undef UINT8_TYPE

2
src/util/format/u_format_s3tc.c
View file

@ -27,8 +27,8 @@
#include "util/format/u_format_s3tc.h"
#include "util/format_srgb.h"
#include "util/u_math.h"
#include "../../mesa/main/texcompress_s3tc_tmp.h"
#include "util/format/texcompress_s3tc_tmp.h"
util_format_dxtn_fetch_t util_format_dxt1_rgb_fetch = (util_format_dxtn_fetch_t)fetch_2d_texel_rgb_dxt1;
util_format_dxtn_fetch_t util_format_dxt1_rgba_fetch = (util_format_dxtn_fetch_t)fetch_2d_texel_rgba_dxt1;